subject:"\[tomcat\] branch master updated\: Update"

[tomcat] branch master updated: Update before I tag

2021-05-08 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 9cf9361  Update before I tag
9cf9361 is described below

commit 9cf936197e782fd656f67a8c4f6400f45d41f4b1
Author: Mark Thomas 
AuthorDate: Sat May 8 16:06:51 2021 +0100

Update before I tag

Note: reproducible builds don't quite work yet. Once we can update to
bnd 5.4.0 the reproducible builds should be possible.
I'm mainly doing this to get into the habit of doing it as part of the
release.
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index bce6fdd..0f78322 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,8 +31,8 @@ version.suffix=-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
-#2021-03-18T06:00:00Z
-#ant.tstamp.now=1616047200
+#2021-05-08T15:00:00Z
+#ant.tstamp.now=1620482400
 
 # - Source control flags -
 git.branch=master

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

[tomcat] branch master updated: Update version number

2021-04-12 Thread 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 1db93d3  Update version number
1db93d3 is described below

commit 1db93d3a0db2fb4d52b102c6a65bb0a870411ab9
Author: remm 
AuthorDate: Mon Apr 12 12:49:25 2021 +0200

Update version number
---
 modules/stuffed/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/stuffed/Dockerfile b/modules/stuffed/Dockerfile
index 3cb4176..5055dc4 100644
--- a/modules/stuffed/Dockerfile
+++ b/modules/stuffed/Dockerfile
@@ -48,7 +48,7 @@ RUN mkdir -p /opt
 # EXPOSE $jolokiaport
 
 # Optional: Add Prometheus agent for JMX monitoring
-# RUN mkdir /opt/prometheus && wget 
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.14.0/jmx_prometheus_javaagent-0.14.0.jar
 -O /opt/prometheus/prometheus.jar && wget 
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
 -O conf/prometheus.yaml
+# RUN mkdir /opt/prometheus && wget 
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.15.0/jmx_prometheus_javaagent-0.15.0.jar
 -O /opt/prometheus/prometheus.jar && wget 
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
 -O conf/prometheus.yaml
 # ARG prometheusport=9404
 # ENV 
JAVA_OPTS="-javaagent:/opt/prometheus/prometheus.jar=$prometheusport:conf/prometheus.yaml
 ${JAVA_OPTS}"
 # EXPOSE $prometheusport

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

[tomcat] branch master updated: Update changelog

2021-04-08 Thread 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.git


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

commit ff2c4e767d225e42580b0897e509fcde1a56229d
Author: Mark Thomas 
AuthorDate: Thu Apr 8 15:55:23 2021 +0100

Update changelog
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1688ef8..8e002bd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Review code used to generate Java source from JSPs and tags and remove
+code found to be unnecessary. (markt)
+  
+
+  
   
 
   

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

[tomcat] branch master updated: Update Java versions used by Travis

2021-04-07 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 09b5dcd  Update Java versions used by Travis
09b5dcd is described below

commit 09b5dcd59223d714aef205328ebb722fa1e054f3
Author: Mark Thomas 
AuthorDate: Wed Apr 7 17:39:57 2021 +0100

Update Java versions used by Travis
---
 .travis.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 159cf52..5f8acaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,10 +40,10 @@ addons:
 install:
 - ARCH=`uname -p`
 - echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz;
-- 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz;
-- 
JDK_ppc64le="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz;
+- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz;
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u282b08.tar.gz;
+- 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.10_9.tar.gz;
+- 
JDK_ppc64le="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz;
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test 
"$ARCH" = "ppc64le"; then JDK_URL=$JDK_ppc64le; elif test "$ARCH" = "s390x"; 
then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi

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

[tomcat] branch master updated: Update Java versions used by GitHub CI

2021-04-07 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new d42777a  Update Java versions used by GitHub CI
d42777a is described below

commit d42777a3c6fda15f0d5fb6c47528e37e21c254e4
Author: Mark Thomas 
AuthorDate: Wed Apr 7 17:25:19 2021 +0100

Update Java versions used by GitHub CI
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9f217a..e9c246e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
 strategy:
   fail-fast: false
   matrix:
-java: [ 8, 11, 14, 15-ea ]
+java: [ 8, 11, 16, 17-ea ]
 os: [ ubuntu-latest ]
 include:
 - os: windows-latest
@@ -46,4 +46,4 @@ jobs:
   run: |
 ant -noinput echoproperties deploy embed test-nio test-status
   env:
-ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true 
-Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/ap
 [...]
\ No newline at end of file
+ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true 
-Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/ap
 [...]

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

[tomcat] branch master updated: Update Tomcat Native to 1.2.28

2021-04-07 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new b293109  Update Tomcat Native to 1.2.28
b293109 is described below

commit b293109e2c10d30706439686a014570e82807d52
Author: Mark Thomas 
AuthorDate: Wed Apr 7 13:35:41 2021 +0100

Update Tomcat Native to 1.2.28
---
 build.properties.default   | 6 +++---
 webapps/docs/changelog.xml | 4 
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c163e02..fd8d153 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -147,13 +147,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.27
+tomcat-native.version=1.2.28
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
+tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
+tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bbb9e60..43a0486 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
 aQute.bnd.annotation.spi.ServiceConsumer annotation as 
this
 triggers TCK failures for downstream consumers of the API JARs. (markt)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.28.
+(markt)
+  
 
   
   

-
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 new versions

2021-04-07 Thread 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 d51a186  Update to new versions
d51a186 is described below

commit d51a1863f2dd9ccff4de4afe07399676fce16d29
Author: remm 
AuthorDate: Wed Apr 7 10:05:56 2021 +0200

Update to new versions
---
 modules/cxf/pom.xml|  2 +-
 modules/owb/pom.xml|  4 ++--
 modules/stuffed/pom.xml|  4 ++--
 webapps/docs/changelog.xml | 10 ++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 88ba629..ea0ab77 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,7 +29,7 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.4.2
+3.4.3
 jar
 
 
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index e22c9bd..45b017e 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.21
+2.0.22
 jar
 
 
 1.2
 1.2
 1.3
-10.0.2
+10.0.5
 
 
 
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index 3d6f129..ded2fef 100644
--- a/modules/stuffed/pom.xml
+++ b/modules/stuffed/pom.xml
@@ -29,8 +29,8 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-10.0.2
-
+10.0.5
+
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2f03833..bbb9e60 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,16 @@
   
 
   
+  
+
+  
+Update the OWB module to Apache OpenWebBeans 2.0.22. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.4.3. (remm)
+  
+
+  
 
 
   

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

[tomcat] branch master updated: Update changelog

2021-03-19 Thread 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.git


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

commit a57f5bcddfcc65ad4d1a42e7e3d03e9be05bdfc5
Author: Mark Thomas 
AuthorDate: Fri Mar 19 15:25:36 2021 +

Update changelog
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b857721..35ee2ca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -151,6 +151,15 @@
   
 
   
+  
+
+  
+Implement the first phase of reproducible builds. Sequential builds on
+the same machine now produce identical output provided that the Ant
+property ant.tstamp.now.iso is set. (markt)
+  
+
+  
 
 
   

-
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 BND 5.3.0

2021-03-01 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 0d6a544  Update to BND 5.3.0
0d6a544 is described below

commit 0d6a5449cf9d3c26e09bf7123e9a5636c6177d48
Author: Mark Thomas 
AuthorDate: Mon Mar 1 21:11:24 2021 +

Update to BND 5.3.0

This moves us off 5.3.0-SNAPSHOT
---
 build.properties.default   | 21 +++--
 webapps/docs/changelog.xml |  3 +++
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 6d4476b..83287ad 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -273,29 +273,22 @@ 
findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/
 
 # - bnd, version 5.3.0 or later  -
 # - provides OSGI metadata for JARs   -
-# *** Using SNAPSHOT *** Using SNAPSHOT *** Using SNAPSHOT ***
-# The specific version used for release builds will be archived at
-# https://home.apache.org/~markt/dev/deps/bnd-5.3.0-SNAPHOT/
-# *** Using SNAPSHOT *** Using SNAPSHOT *** Using SNAPSHOT ***
-bnd.version=5.3.0-SNAPSHOT
-
-# checksums for biz.aQute.bnd-5.2.0.jar
-# *** Disabled while we depend on SNAPSHOT JARs ***
-bnd.checksum.enabled=false
+bnd.version=5.3.0
+
+# checksums for biz.aQute.bnd-5.3.0.jar
+bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=3254df4b94104002f79005ae54ec1dbb|1d69d0a5862133ac1f54555c9cd59011d79bbb86
+bnd.checksum.value=7cba73481ee6e72b182ba5c13801aafe|10ec0974db02f810e9345b218f4de4abe898ab04
 
 bnd.home=${base.path}/bnd-${bnd.version}
 bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
-# *** Temporary change to use the SNAPSHOT repository ***
-# 
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
-bnd.loc=https://bndtools.jfrog.io/bndtools/update-snapshot/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
+bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
 
 # - OSGi annotations bundle, version 1.0.0 or later-
 # - required to avoid Javadoc error when using bnd annotations -
 osgi-annotations.version=1.0.0
 
-# checksums for biz.aQute.bnd-5.2.0.jar
+# checksums for OSGi annotations, version 1.0.0
 osgi-annotations.checksum.enabled=true
 osgi-annotations.checksum.algorithm=MD5|SHA-1
 
osgi-annotations.checksum.value=153054f987534244f95a399539b11375|b6e802bceba0682353466abf8fadbbd662b2f7f8
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c3bee58..64eefbb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -219,6 +219,9 @@
   
 Improvements to Chinese translations. Provided by shawn. (mark)
   
+  
+Update to bnd 5.3.0. (markt)
+  
 
   
 


-
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

2021-02-08 Thread 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

[tomcat] branch master updated: Update log message to align with code

2021-02-01 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new c7f535e  Update log message to align with code
c7f535e is described below

commit c7f535ee869283d3ec6fb030ba805c5a8117c4f3
Author: Mark Thomas 
AuthorDate: Mon Feb 1 13:17:51 2021 +

Update log message to align with code

Pruning previously started at maxConcurrentStreams + 10% but was changed
to 5 * maxConcurrentStreams to meet the requirements of RFC 7540, page
20 to retain stream information for a 'significant' period of time.
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java  | 12 ++--
 java/org/apache/coyote/http2/LocalStrings.properties   |  2 +-
 java/org/apache/coyote/http2/LocalStrings_fr.properties|  2 +-
 java/org/apache/coyote/http2/LocalStrings_ko.properties|  2 +-
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index e5e0cf7..947be5f 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1181,12 +1181,6 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 // maximum number of concurrent streams.
 long max = localSettings.getMaxConcurrentStreams();
 
-final int size = streams.size();
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
-Long.toString(max), Integer.toString(size)));
-}
-
 // Only need ~+10% for streams that are in the priority tree,
 // Ideally need to retain information for a "significant" amount of 
time
 // after sending END_STREAM (RFC 7540, page 20) so we detect potential
@@ -1198,6 +1192,12 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 max = Integer.MAX_VALUE;
 }
 
+final int size = streams.size();
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
+Long.toString(max), Integer.toString(size)));
+}
+
 int toClose = size - (int) max;
 if (toClose < 1) {
 return;
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties 
b/java/org/apache/coyote/http2/LocalStrings.properties
index a1c4075..a8e0a85 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -130,7 +130,7 @@ upgradeHandler.pause.entry=Connection [{0}] Pausing
 upgradeHandler.pingFailed=Connection [{0}] Failed to send ping to client
 upgradeHandler.prefaceReceived=Connection [{0}], Connection preface received 
from client
 upgradeHandler.pruneIncomplete=Connection [{0}], Stream [{1}], Failed to fully 
prune the connection because there are [{2}] too many active streams
-upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams. 
Limit is [{1}] + 10% and there are currently [{2}] streams.
+upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams. 
Limit is [{1}] and there are currently [{2}] streams.
 upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
 upgradeHandler.prunedPriority=Connection [{0}] Pruned unused stream [{1}] that 
may have been part of the priority tree
 upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from 
backlog
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties 
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index faa29f9..6798bb5 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -130,7 +130,7 @@ upgradeHandler.pause.entry=Connection [{0}] mise en pause
 upgradeHandler.pingFailed=La connection [{0}] n''a pas réussi à envoyer un 
ping au client
 upgradeHandler.prefaceReceived=Connection [{0}], préface de la connection 
recue du client
 upgradeHandler.pruneIncomplete=Connexion [{0}], Flux [{1}], Erreur lors de 
l''élimination complète de la connexion parce que des flux sont encore actifs / 
utilisés dans l''arbre de priorité, il y a [{2}] flux en trop
-upgradeHandler.pruneStart=Connection [{0}] Début de l''élimination des anciens 
flux, la limite est de [{1}] + 10 % et il y a actuellement [{2}] flux
+upgradeHandler.pruneStart=Connection [{0}] Début de l''élimination des anciens 
flux, la limite est de [{1}]  et il y a actuellement [{2}] flux
 upgradeHandler.pruned=Connection [{0}] Elimination du flux terminé [{1}]
 upgradeHandler.prunedPriority=La connexion [{0}] a élagué le flux inutilisé 
[{1}] qui faisait

[tomcat] branch master updated: Update NSIS to version 3.06.1. Update build script to create an Unicode installer. See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode

2021-01-26 Thread kkolinko

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

kkolinko 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 654e01e  Update NSIS to version 3.06.1. Update build script to create 
an Unicode installer. See 
https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
654e01e is described below

commit 654e01edd2c884af8456be08466f830ab9163dec
Author: Konstantin Kolinko 
AuthorDate: Wed Jan 27 07:09:23 2021 +0300

Update NSIS to version 3.06.1.
Update build script to create an Unicode installer.
See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
---
 build.properties.default   | 4 ++--
 res/tomcat.nsi | 2 ++
 webapps/docs/changelog.xml | 4 
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 4819376..ccdfc01 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -156,10 +156,10 @@ 
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
 
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
 
 # - NSIS, version 3.0 or later -
-nsis.version=3.04
+nsis.version=3.06.1
 nsis.checksum.enabled=true
 nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=434e89380742d415ca9b91676cb92540|ed241f7384f4e59d84b9a62c71d1f6955b6a719a
+nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
 nsis.home=${base.path}/nsis-${nsis.version}
 nsis.exe=${nsis.home}/makensis.exe
 nsis.arch.dir=x86-unicode/
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 0bdeec2..3f92c83 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -15,6 +15,8 @@
 
 ; Tomcat script for Nullsoft Installer
 
+Unicode true
+
 !ifdef UNINSTALLONLY
   OutFile "tempinstaller.exe"
 !else
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eb17437..e4f6181 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -259,6 +259,10 @@
 Improvements to Russian translations. Provided by Polina and Azat.
 (markt)
   
+  
+Update the NSIS Installer used to build the Windows installer to 
version
+3.06.1. (kkolinko)
+  
 
   
 


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

[tomcat] branch master updated: Update code signing to use SHA-512

2021-01-26 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new fa3a9dc  Update code signing to use SHA-512
fa3a9dc is described below

commit fa3a9dc142eb83f1129e5018a6cce53c282b05b2
Author: Mark Thomas 
AuthorDate: Tue Jan 26 16:33:51 2021 +

Update code signing to use SHA-512
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index be0f1da..6c9bc10 100644
--- a/build.xml
+++ b/build.xml
@@ -2576,7 +2576,7 @@ skip.installer property in build.properties" />
   
   
   
-  
+  
   
   http://timestamp.digicert.com"/>
   
@@ -2608,7 +2608,7 @@ skip.installer property in build.properties" />
   
   
   
-  
+  
   
   http://timestamp.digicert.com"/>
   


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

[tomcat] branch master updated: Update false positives

2021-01-26 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 956dfbd  Update false positives
956dfbd is described below

commit 956dfbdab59350b698eac5448dd9dde9730ae4b7
Author: Mark Thomas 
AuthorDate: Tue Jan 26 14:01:47 2021 +

Update false positives
---
 res/findbugs/filter-false-positives.xml | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/res/findbugs/filter-false-positives.xml 
b/res/findbugs/filter-false-positives.xml
index e4b6005..e47e128 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -392,6 +392,12 @@
 
   
   
+  
+
+
+
+  
+  
   
 
 
@@ -1007,9 +1013,9 @@
   
 
-
-
-
+
+
+

[tomcat] branch master updated: Update to Commons Daemon 1.2.4

2021-01-22 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 0c23b7e  Update to Commons Daemon 1.2.4
0c23b7e is described below

commit 0c23b7edb38435c1a5872073173aefdc2645af8f
Author: Mark Thomas 
AuthorDate: Fri Jan 22 09:57:32 2021 +

Update to Commons Daemon 1.2.4
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 9ffa4a2..4819376 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -171,20 +171,20 @@ 
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.3
+commons-daemon.version=1.2.4
 
-# checksum for commons-daemon-1.2.3-bin.tar.gz
+# checksum for commons-daemon-1.2.4-bin.tar.gz
 commons-daemon.bin.checksum.enabled=true
 commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=0d7ced8f5d6fd3e8781146ee47c37046c6ccd2f364138f89d137eea5f0255e1b2afae5faf7005164c077087cb08203fd44478d5c14c57c7df449feb324443447
+commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
 
-# checksums for commons-daemon-1.2.3-native-src.tar.gz, 
commons-daemon-1.2.3-bin-windows.zip
+# checksums for commons-daemon-1.2.4-native-src.tar.gz, 
commons-daemon-1.2.4-bin-windows.zip
 commons-daemon.native.src.checksum.enabled=true
 commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=5f223ee3c133f673fe698f575d7cfb15f27fbbb8acf2e6db292e0e1690a20d636b35312187aa1091b315062f2434788eec9cde167e2ae1d7e673ebdd2ddb41f6
+commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
 commons-daemon.native.win.checksum.enabled=true
 commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=c79ee31a367addc5d49db474aabe084cebcd4f7f0f0f9ddc7999c02d4de5cd6ace6d5f55a230f399cfaaf780179b6f9808739efc7500b18c27cdb963daaef8d5
+commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
 
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ff2839..9553dad 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -233,6 +233,9 @@
 Use java.nio.file.Path to test for one directory being a
 sub-directory of another in a consistent way. (markt)
   
+  
+Update to Commons Daemon 1.2.4. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Update Commons DBCP

2021-01-15 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 3f889ee  Update Commons DBCP
3f889ee is described below

commit 3f889eedce818351b216f87aae67e2a77816f7ab
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:42:38 2021 +

Update Commons DBCP
---
 MERGE.txt  |   2 +-
 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java  |  24 ++---
 .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java  |  40 ---
 .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java   |  13 ++-
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java|  18 ++--
 .../dbcp/dbcp2/DelegatingDatabaseMetaData.java |   3 +-
 .../tomcat/dbcp/dbcp2/DelegatingResultSet.java |   6 +-
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java |  17 ++-
 .../tomcat/dbcp/dbcp2/DriverConnectionFactory.java |  13 +--
 .../apache/tomcat/dbcp/dbcp2/DriverFactory.java|   6 +-
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java |   6 ++
 .../dbcp/dbcp2/LifetimeExceededException.java  |   1 -
 .../tomcat/dbcp/dbcp2/ObjectNameWrapper.java   |   8 +-
 java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java|  71 +++--
 .../dbcp/dbcp2/PoolableCallableStatement.java  |   4 +-
 .../tomcat/dbcp/dbcp2/PoolableConnection.java  |  20 +++-
 .../dbcp/dbcp2/PoolableConnectionFactory.java  |  45 +---
 .../dbcp/dbcp2/PoolablePreparedStatement.java  |   8 +-
 .../tomcat/dbcp/dbcp2/PoolingConnection.java   |  10 +-
 .../tomcat/dbcp/dbcp2/PoolingDataSource.java   |   4 +-
 .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java|  16 ++-
 .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java |   2 +-
 java/org/apache/tomcat/dbcp/dbcp2/Utils.java   |  45 +---
 .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java |   4 +-
 .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 118 +++--
 .../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java   |   4 +-
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|  22 ++--
 .../dbcp2/datasources/CPDSConnectionFactory.java   |  11 +-
 .../dbcp2/datasources/InstanceKeyDataSource.java   |   7 --
 .../datasources/InstanceKeyDataSourceFactory.java  |  18 ++--
 .../datasources/KeyedCPDSConnectionFactory.java|  13 +--
 .../tomcat/dbcp/dbcp2/datasources/PoolKey.java |  26 ++---
 .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java |  23 +---
 .../dbcp/dbcp2/datasources/package-info.java   |   2 +-
 .../dbcp/dbcp2/managed/BasicManagedDataSource.java |  32 +++---
 .../managed/DataSourceXAConnectionFactory.java |  34 +++---
 .../dbcp2/managed/LocalXAConnectionFactory.java|  35 +++---
 .../dbcp/dbcp2/managed/ManagedConnection.java  |  35 +++---
 .../dbcp/dbcp2/managed/ManagedDataSource.java  |  32 +++---
 .../managed/PoolableManagedConnectionFactory.java  |   2 +-
 .../dbcp/dbcp2/managed/TransactionContext.java |  34 +++---
 .../dbcp2/managed/TransactionContextListener.java  |  32 +++---
 .../dbcp/dbcp2/managed/TransactionRegistry.java|  34 +++---
 .../dbcp/dbcp2/managed/XAConnectionFactory.java|  32 +++---
 .../apache/tomcat/dbcp/dbcp2/package-info.java.rej |   9 ++
 webapps/docs/changelog.xml |   4 +
 46 files changed, 433 insertions(+), 512 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 52851d9..806669a 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -69,4 +69,4 @@ Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-6d232e547d5725e419832fc514fc0348aa897e7c (2020-08-11)
+e24196a95bbbc531eb3c5f1b19e1dc42fd78a783 (2021-01-15)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 5ac1372..08762f0 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -528,7 +528,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
 
 // Set up the poolable connection factory
 boolean success = false;
-PoolableConnectionFactory poolableConnectionFactory;
+final PoolableConnectionFactory poolableConnectionFactory;
 try {
 poolableConnectionFactory = 
createPoolableConnectionFactory(driverConnectionFactory);
 
poolableConnectionFactory.setPoolStatements(poolPreparedStatements);
@@ -605,7 +605,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
  */
 protected GenericObjectPool createObjectPool(final 
PoolableConnectionFactory factory,
 final GenericObjectPoolConfig poolConfig, 
final AbandonedConfig abandonedConfig) {
-GenericObjectPool gop;
+final GenericObjectPool gop;

[tomcat] branch master updated: Update Commons FileUpload - cosmetic only

2021-01-15 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new b4775ee  Update Commons FileUpload - cosmetic only
b4775ee is described below

commit b4775eec749ea15117719900346cf2563137db9e
Author: Mark Thomas 
AuthorDate: Fri Jan 15 14:35:16 2021 +

Update Commons FileUpload - cosmetic only
---
 MERGE.txt  |  2 +-
 .../util/http/fileupload/FileItemIterator.java | 14 ++--
 .../util/http/fileupload/FileItemStream.java   |  2 +-
 .../tomcat/util/http/fileupload/FileUpload.java|  6 +-
 .../util/http/fileupload/FileUploadBase.java   | 90 +++---
 .../util/http/fileupload/FileUploadException.java  |  6 +-
 .../http/fileupload/InvalidFileNameException.java  |  2 +-
 .../util/http/fileupload/MultipartStream.java  | 70 -
 .../util/http/fileupload/ParameterParser.java  | 25 +++---
 .../util/http/fileupload/disk/DiskFileItem.java| 38 -
 .../http/fileupload/disk/DiskFileItemFactory.java  | 14 ++--
 .../http/fileupload/impl/FileItemIteratorImpl.java | 38 -
 .../http/fileupload/impl/FileItemStreamImpl.java   | 14 ++--
 .../impl/FileSizeLimitExceededException.java   |  8 +-
 .../fileupload/impl/FileUploadIOException.java |  2 +-
 .../fileupload/impl/IOFileUploadException.java |  2 +-
 .../impl/InvalidContentTypeException.java  |  5 +-
 .../util/http/fileupload/impl/SizeException.java   |  2 +-
 .../impl/SizeLimitExceededException.java   |  4 +-
 .../http/fileupload/servlet/ServletFileUpload.java |  9 +--
 .../fileupload/servlet/ServletRequestContext.java  |  4 +-
 .../http/fileupload/util/FileItemHeadersImpl.java  | 14 ++--
 .../http/fileupload/util/LimitedInputStream.java   |  8 +-
 .../tomcat/util/http/fileupload/util/Streams.java  | 20 ++---
 .../http/fileupload/util/mime/MimeUtility.java | 36 -
 .../http/fileupload/util/mime/ParseException.java  |  2 +-
 .../util/mime/QuotedPrintableDecoder.java  | 16 ++--
 .../http/fileupload/util/mime/RFC2231Utility.java  | 28 +++
 28 files changed, 237 insertions(+), 244 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 1c449c7..8071016 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,7 +51,7 @@ FileUpload
 Sub-tree:
 src/main/java/org/apache/commons/fileupload2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-c25a4e33553a5f098ab6065a54e1ae7985025d26 (2020-08-26)
+ee0a7131b6b87586b28542de354951414dedac3f (2021-01-15)
 
 Note: Tomcat's copy of fileupload also includes classes copied manually from
   Commons IO.
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java 
b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
index 59a81f4..53ec2d4 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
@@ -34,7 +34,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setFileSizeMax(long)} on 
this object.
  * @return The maximum size of a single, uploaded file. The value -1 
indicates "unlimited".
  */
-public long getFileSizeMax();
+long getFileSizeMax();
 
 /** Sets the maximum size of a single file. An {@link 
FileSizeLimitExceededException}
  * will be thrown, if there is an uploaded file, which is exceeding this 
value.
@@ -45,7 +45,7 @@ public interface FileItemIterator {
  * Note:Changing this value doesn't affect files, that have 
already been uploaded.
  * @param pFileSizeMax The maximum size of a single, uploaded file. The 
value -1 indicates "unlimited".
  */
-public void setFileSizeMax(long pFileSizeMax);
+void setFileSizeMax(long pFileSizeMax);
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -54,7 +54,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setSizeMax(long)} on this 
object.
  * @return The maximum size of the complete HTTP request. The value -1 
indicates "unlimited".
  */
-public long getSizeMax();
+long getSizeMax();
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -66,7 +66,7 @@ public interface FileItemIterator {
  * yet been invoked.
  * @param pSizeMax The maximum size of the complete HTTP request. The 
value -1 indicates "unlimited".
  */
-public void setSizeMax(long pSizeMax);
+void setSizeMax(long pSizeMax);
 
 /**
  * Returns, whether another instance of {@link FileItemStream}
@@ -78,7 +78,7 @@ public interface

[tomcat] branch master updated: Update Codec - no substantive changes

2021-01-15 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new c9214a0  Update Codec - no substantive changes
c9214a0 is described below

commit c9214a0f18758de37a1fb432cfd25532953ea635
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:27:10 2021 +

Update Codec - no substantive changes
---
 MERGE.txt |  2 +-
 java/org/apache/tomcat/util/codec/binary/Base64.java  | 10 +-
 java/org/apache/tomcat/util/codec/binary/StringUtils.java |  8 
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 58541c1..1c449c7 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -43,7 +43,7 @@ Codec
 Sub-tree:
 src/main/java/org/apache/commons/codec
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-53c93d0ffccb65d182306c74d1230ce814889dc1 (2020-08-18)
+2e9785b93a2aacedd84abc6a646cdb200940b818 (2021-01-15)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
 FileUpload
diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 2b5c7d4..08d7d34 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -360,8 +360,8 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte b : arrayOctet) {
-if (!isBase64(b) && !isWhiteSpace(b)) {
+for (byte element : arrayOctet) {
+if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }
 }
@@ -428,7 +428,8 @@ public class Base64 extends BaseNCodec {
 private static void validateCharacter(final int emptyBitsMask, final 
Context context) {
 if ((context.ibitWorkArea & emptyBitsMask) != 0) {
 throw new IllegalArgumentException(
-"Last encoded character (before the paddings if any) is a 
valid base 64 alphabet but not a possible value. " +
+"Last encoded character (before the paddings if any) is a 
valid " +
+"base 64 alphabet but not a possible value. " +
 "Expected the discarded bits to be zero.");
 }
 }
@@ -586,8 +587,7 @@ public class Base64 extends BaseNCodec {
 }
 if (lineLength > 0){ // null line-sep forces no chunking rather 
than throwing IAE
 this.encodeSize = BYTES_PER_ENCODED_BLOCK + 
lineSeparator.length;
-this.lineSeparator = new byte[lineSeparator.length];
-System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, 
lineSeparator.length);
+this.lineSeparator = lineSeparator.clone();
 } else {
 this.encodeSize = BYTES_PER_ENCODED_BLOCK;
 this.lineSeparator = null;
diff --git a/java/org/apache/tomcat/util/codec/binary/StringUtils.java 
b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
index 673dd0f..979313b 100644
--- a/java/org/apache/tomcat/util/codec/binary/StringUtils.java
+++ b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
@@ -55,8 +55,8 @@ public class StringUtils {
  *the String to encode, may be {@code null}
  * @return encoded bytes, or {@code null} if the input string was {@code 
null}
  * @throws NullPointerException
- * Thrown if {@link StandardCharsets#UTF_8} is not 
initialized, which should never happen since it is
- * required by the Java platform specification.
+ * Thrown if {@link StandardCharsets#UTF_8} is not 
initialized, which should never happen
+ * since it is required by the Java platform specification.
  * @since As of 1.7, throws {@link NullPointerException} instead of 
UnsupportedEncodingException
  * @see http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
@@ -88,8 +88,8 @@ public class StringUtils {
  * @return A new {@code String} decoded from the specified array of bytes 
using the US-ASCII charset,
  * or {@code null} if the input byte array was {@code null}.
  * @throws NullPointerException
- * Thrown if {@link StandardCharsets#US_ASCII} is not 
initialized, which should never happen since it is
- * required by the Java platform specification.
+ * Thrown if {@link StandardCharsets#US_ASCII} is not 
initialized, which should never happen
+ * since it is required by the Java platform specification.
  * @since As of 1.7, throws {@link NullPointerException} instead of 
UnsupportedEncodingException
  */
 public static

[tomcat] branch master updated: Update BCEL

2021-01-15 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 8c69446  Update BCEL
8c69446 is described below

commit 8c69446a7b5c0c315c9a6c9ef50f84af28b5d400
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:00:15 2021 +

Update BCEL

Only change is removal of one superfluous call to super(). Not worth an
entry in the chaneg log.
---
 MERGE.txt| 2 +-
 java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index b8c152d..58541c1 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -36,7 +36,7 @@ BCEL
 Sub-tree:
 src/main/java/org/apache/bcel
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.5.0
+4637826ac76db6cd4ff7eb56d1b13e16d4b43320 (2021-01-15)
 
 Codec
 -
diff --git 
a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java 
b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
index 86a9e0b..f841735 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
@@ -27,7 +27,6 @@ public class ClassFormatException extends RuntimeException {
 private static final long serialVersionUID = 3243149520175287759L;
 
 public ClassFormatException() {
-super();
 }
 
 


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

[tomcat] branch master updated: Update Tomcat Native to 1.2.26

2021-01-05 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new c851c02  Update Tomcat Native to 1.2.26
c851c02 is described below

commit c851c021438442d26fcf23b93d49f0734099f947
Author: Mark Thomas 
AuthorDate: Tue Jan 5 14:51:01 2021 +

Update Tomcat Native to 1.2.26
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  4 
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index dd1a4c0..688a272 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -93,7 +93,7 @@ compile.debug=true
 # Do not pass -deprecation (-Xlint:deprecation) flag to javac
 compile.deprecation=false
 
-base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
+base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
 base-apache.loc.2=https://archive.apache.org/dist
 base-commons.loc.1=${base-apache.loc.1}/commons
 base-commons.loc.2=${base-apache.loc.2}/commons
@@ -145,19 +145,19 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.25
+tomcat-native.version=1.2.26
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d
+tomcat-native.src.checksum.value=cad9d9efdb6c980afcf304bd78e5ea572271075e153e2015d393dd5e6f4612992c7d0ac499c9aeafe0c3874832356e197564717df15b36a48aba775960659ac2
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=0171a7ff3db708c2051e1f7a188286c5174091e208e1822c3027dd7aa415562c94be8d397a61bbe57bf9ee40ab52e1b346123fb7f2b170a43c60e8596eb65618
+tomcat-native.win.checksum.value=607b45074fda397f2fc49f0f3b4128df5373d692b82167f39f5430e04846b788db1487c0805173c924ab0c94d5767b6c5bba887a1148f104eca39c09d19539d1
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
 
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
 
 # - NSIS, version 3.0 or later -
 nsis.version=3.04
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a0a6758..86a49e2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -199,6 +199,10 @@
   
 Improvements to Korean translations. (woonsan)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.26.
+(markt)
+  
 
   
 


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

[tomcat] branch master updated: update Javadoc return value for ServletContext#getMajorVersion()

2020-12-21 Thread mgrigorov

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

mgrigorov 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 538fb42  update Javadoc return value for 
ServletContext#getMajorVersion()
538fb42 is described below

commit 538fb427d32d574006372a319c276adac873006e
Author: zzk0 <30856589+z...@users.noreply.github.com>
AuthorDate: Mon Dec 21 17:51:40 2020 +0800

update Javadoc return value for ServletContext#getMajorVersion()
---
 java/jakarta/servlet/ServletContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index 82427ca..38dd583 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -95,7 +95,7 @@ public interface ServletContext {
  * container supports. All implementations that comply with Version 5.0 
must
  * have this method return the integer 5.
  *
- * @return 4
+ * @return 5
  */
 public int getMajorVersion();
 


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

[tomcat] branch master updated: Update ide-support package version

2020-12-14 Thread mgrigorov

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

mgrigorov 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 98ef763  Update ide-support package version
 new 8e84084  Merge pull request #388 from zzk0/master
98ef763 is described below

commit 98ef76388974ce7e17bcfb9d0602a915e3c206f9
Author: zhouzekai 
AuthorDate: Sat Dec 12 16:10:21 2020 +0800

Update ide-support package version
---
 res/ide-support/eclipse/eclipse.classpath | 2 +-
 res/ide-support/idea/tomcat.iml   | 2 +-
 res/ide-support/netbeans/project.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 5b34ea5..d298189 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,6 +29,6 @@
 
 
 
-
+
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 268961a..e749442 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 0dd6468..498fd3a 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.3.0-SNAPSHOT/biz.aQute.bnd-5.3.0-SNAPSHOT.jar:${ant.includes}/
 1.7
 
 


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

[tomcat] branch master updated: Update deprecation as code is shared between Tomcat 10 and Tomcat Native

2020-12-10 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new a6b6781  Update deprecation as code is shared between Tomcat 10 and 
Tomcat Native
a6b6781 is described below

commit a6b67811ef62d475d095166c63f4d9bcab54f15b
Author: Mark Thomas 
AuthorDate: Thu Dec 10 13:53:17 2020 +

Update deprecation as code is shared between Tomcat 10 and Tomcat Native
---
 java/org/apache/tomcat/jni/Address.java   | 5 +++--
 java/org/apache/tomcat/jni/Directory.java | 5 +++--
 java/org/apache/tomcat/jni/File.java  | 5 +++--
 java/org/apache/tomcat/jni/FileInfo.java  | 5 +++--
 java/org/apache/tomcat/jni/Global.java| 5 +++--
 java/org/apache/tomcat/jni/Local.java | 5 +++--
 java/org/apache/tomcat/jni/Lock.java  | 5 +++--
 java/org/apache/tomcat/jni/Mmap.java  | 5 +++--
 java/org/apache/tomcat/jni/Multicast.java | 5 +++--
 java/org/apache/tomcat/jni/OS.java| 5 +++--
 java/org/apache/tomcat/jni/Poll.java  | 5 +++--
 java/org/apache/tomcat/jni/PoolCallback.java  | 5 +++--
 java/org/apache/tomcat/jni/Proc.java  | 5 +++--
 java/org/apache/tomcat/jni/ProcErrorCallback.java | 5 +++--
 java/org/apache/tomcat/jni/Procattr.java  | 5 +++--
 java/org/apache/tomcat/jni/Registry.java  | 5 +++--
 java/org/apache/tomcat/jni/SSLSocket.java | 5 +++--
 java/org/apache/tomcat/jni/Shm.java   | 5 +++--
 java/org/apache/tomcat/jni/Sockaddr.java  | 5 +++--
 java/org/apache/tomcat/jni/Socket.java| 5 +++--
 java/org/apache/tomcat/jni/Status.java| 5 +++--
 java/org/apache/tomcat/jni/Stdlib.java| 5 +++--
 java/org/apache/tomcat/jni/Thread.java| 5 +++--
 java/org/apache/tomcat/jni/Time.java  | 5 +++--
 java/org/apache/tomcat/jni/User.java  | 5 +++--
 25 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/java/org/apache/tomcat/jni/Address.java 
b/java/org/apache/tomcat/jni/Address.java
index cabaabc..87eba9e 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -21,8 +21,9 @@ package org.apache.tomcat.jni;
  * @author Mladen Turk
  *
  * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
- *  10.1.x onwards to only those components required to provide
- *  OpenSSL integration with the NIO and NIO2 connectors.
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
 @Deprecated
 public class Address {
diff --git a/java/org/apache/tomcat/jni/Directory.java 
b/java/org/apache/tomcat/jni/Directory.java
index 8eb6087..2b3e081 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
  * @author Mladen Turk
  *
  * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
- *  10.1.x onwards to only those components required to provide
- *  OpenSSL integration with the NIO and NIO2 connectors.
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
 @Deprecated
 public class Directory {
diff --git a/java/org/apache/tomcat/jni/File.java 
b/java/org/apache/tomcat/jni/File.java
index 9128b62..e86c282 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -24,8 +24,9 @@ import java.nio.ByteBuffer;
  * @author Mladen Turk
  *
  * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
- *  10.1.x onwards to only those components required to provide
- *  OpenSSL integration with the NIO and NIO2 connectors.
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
 @Deprecated
 public class File {
diff --git a/java/org/apache/tomcat/jni/FileInfo.java 
b/java/org/apache/tomcat/jni/FileInfo.java
index 9eeba1a..8bd8549 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
  * @author Mladen Turk
  *
  * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
- *  10.1.x onwards to only those components required to provide
- *  OpenSSL integration with the NIO and NIO2 connectors.
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+

[tomcat] branch master updated: Update version numbers

2020-12-09 Thread 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 630adb6  Update version numbers
630adb6 is described below

commit 630adb6272beb02cd709465441e841f2d362b6fb
Author: remm 
AuthorDate: Wed Dec 9 14:18:23 2020 +0100

Update version numbers
---
 modules/owb/pom.xml |  2 +-
 modules/stuffed/pom.xml | 12 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index b8a88eb..619e55a 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -36,7 +36,7 @@
 1.2
 1.2
 1.3
-10.0.0-M10
+10.0.0
 
 
 
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index 6d0b6b6..a46dad5 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-M10
-
+10.0.0
+
 
 
 
@@ -95,6 +95,14 @@
 
 
 
false
+
+
+*:*
+
+module-info.class
+
+
+
 
 
 


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

[tomcat] branch master updated: Update version numbers

2020-11-18 Thread 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 8b8d7e1  Update version numbers
8b8d7e1 is described below

commit 8b8d7e1f72b9dee6eff0ebd468340511e1298580
Author: remm 
AuthorDate: Wed Nov 18 10:17:19 2020 +0100

Update version numbers

Some cleanups.
---
 modules/cxf/pom.xml|  7 ---
 modules/owb/pom.xml| 10 +-
 modules/stuffed/Dockerfile |  2 +-
 modules/stuffed/pom.xml|  4 ++--
 webapps/docs/changelog.xml | 10 ++
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 495ec6b..57ae446 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.0
+3.4.1
 jar
 
 
-1.0.1
+1.3
 1.1.4
 1.0
-1.2.4
+1.2.8
 
 
 
@@ -132,6 +132,7 @@

jakarta.inject:*

jakarta.interceptor:*

+   
org.apache.geronimo.specs:geronimo-jta_1.1_spec

org.apache.ant:*

org.codehaus.woodstox:*

org.glassfish.jaxb:*
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index b62360d..b8a88eb 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.18
+2.0.20
 jar
 
 
-1.0
-1.0
-1.0.1
-10.0.0-M8
+1.2
+1.2
+1.3
+10.0.0-M10
 
 
 
diff --git a/modules/stuffed/Dockerfile b/modules/stuffed/Dockerfile
index 83e5b6e..3cb4176 100644
--- a/modules/stuffed/Dockerfile
+++ b/modules/stuffed/Dockerfile
@@ -48,7 +48,7 @@ RUN mkdir -p /opt
 # EXPOSE $jolokiaport
 
 # Optional: Add Prometheus agent for JMX monitoring
-# RUN mkdir /opt/prometheus && wget 
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.13.0/jmx_prometheus_javaagent-0.13.0.jar
 -O /opt/prometheus/prometheus.jar && wget 
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
 -O conf/prometheus.yaml
+# RUN mkdir /opt/prometheus && wget 
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.14.0/jmx_prometheus_javaagent-0.14.0.jar
 -O /opt/prometheus/prometheus.jar && wget 
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
 -O conf/prometheus.yaml
 # ARG prometheusport=9404
 # ENV 
JAVA_OPTS="-javaagent:/opt/prometheus/prometheus.jar=$prometheusport:conf/prometheus.yaml
 ${JAVA_OPTS}"
 # EXPOSE $prometheusport
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index c8dfa78..6d0b6b6 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-M8
-
+10.0.0-M10
+
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 68f74dd..f19b41f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,16 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Update the OWB module to Apache OpenWebBeans 2.0.20. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.4.1. (remm)
+  
+
+  
 
 
   


-
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 bnd 5.3.0-SNAPSHOT to workaround JDK-8255854

2020-11-06 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 3b6e149  Update to bnd 5.3.0-SNAPSHOT to workaround JDK-8255854
3b6e149 is described below

commit 3b6e14993fc2b3a55e87f3d56b6a6d4df417cd59
Author: Mark Thomas 
AuthorDate: Fri Nov 6 08:36:04 2020 +

Update to bnd 5.3.0-SNAPSHOT to workaround JDK-8255854
---
 build.properties.default   | 15 +++
 webapps/docs/changelog.xml |  4 +++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d02143a..de2407b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -286,18 +286,25 @@ saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
 saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
 
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
 
-# - bnd, version 5.1.1 or later  -
+# - bnd, version 5.3.0 or later  -
 # - provides OSGI metadata for JARs   -
-bnd.version=5.2.0
+# *** Using SNAPSHOT *** Using SNAPSHOT *** Using SNAPSHOT ***
+# The specific version used for release builds will be archived at
+# https://home.apache.org/~markt/dev/deps/bnd-5.3.0-SNAPHOT/
+# *** Using SNAPSHOT *** Using SNAPSHOT *** Using SNAPSHOT ***
+bnd.version=5.3.0-SNAPSHOT
 
 # checksums for biz.aQute.bnd-5.2.0.jar
-bnd.checksum.enabled=true
+# *** Disabled while we depend on SNAPSHOT JARs ***
+bnd.checksum.enabled=false
 bnd.checksum.algorithm=MD5|SHA-1
 
bnd.checksum.value=3254df4b94104002f79005ae54ec1dbb|1d69d0a5862133ac1f54555c9cd59011d79bbb86
 
 bnd.home=${base.path}/bnd-${bnd.version}
 bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
-bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
+# *** Temporary change to use the SNAPSHOT repository ***
+# 
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
+bnd.loc=https://bndtools.jfrog.io/bndtools/update-snapshot/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
 
 # - OSGi annotations bundle, version 1.0.0 or later-
 # - required to avoid Javadoc error when using bnd annotations -
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b61d2fa..1e4779e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -182,7 +182,9 @@
 Improvements to Russian translations. Provided by Azat. (markt)
   
   
-Update to bnd 5.2.0. (markt)
+Update to bnd 5.3.0-SNAPSHOT to work around a
+https://bugs.openjdk.java.net/browse/JDK-8255854;>JRE bug.
+(markt)
   
 
   


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

[tomcat] branch master updated: Update .travis.yml

2020-10-06 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 643e627  Update .travis.yml
643e627 is described below

commit 643e627779bd1633b8e447026f4d1ab3f860307a
Author: Mark Thomas 
AuthorDate: Tue Oct 6 10:59:03 2020 +0100

Update .travis.yml

Fix broken travis builds. There was a new Ant release so the mirrors 
updated.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3f7ece..b049844 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,8 @@ install:
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi
 - export JAVA_HOME=`pwd`/jdk
-- wget -q 
https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
-- export ANT_HOME=`pwd`/apache-ant-1.10.8
+- wget -q 
https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.9-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
+- export ANT_HOME=`pwd`/apache-ant-1.10.9
 - export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
 - java -version
 - ant -version


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

[tomcat] branch master updated: Update FailedRequestFilter's javadoc

2020-10-06 Thread mgrigorov

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

mgrigorov 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 864b138  Update FailedRequestFilter's javadoc
864b138 is described below

commit 864b138b3948011219b23a9b754cce3a94abe25e
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Oct 6 09:44:01 2020 +0300

Update FailedRequestFilter's javadoc

Use same text as at 
http://tomcat.apache.org/tomcat-9.0-doc/config/filter.html#Failed_Request_Filter

discussed-at: https://markmail.org/message/ys3el54jmzta5jby
---
 java/org/apache/catalina/filters/FailedRequestFilter.java | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java 
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 7c62232..41ee200 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -35,11 +35,12 @@ import org.apache.tomcat.util.http.Parameters.FailReason;
  * submitted by client are lost.
  *
  * 
- * Note that it has side effect that it triggers parameter parsing and thus
- * consumes the body for POST requests. Parameter parsing does check content
- * type of the request, so there should not be problems with addresses that use
- * request.getInputStream() and request.getReader(),
- * if requests parsed by them do not use standard value for content mime-type.
+ * Note that parameter parsing may consume the body of an HTTP request, so
+ * caution is needed if the servlet protected by this filter uses
+ * request.getInputStream() or request.getReader()
+ * calls. In general the risk of breaking a web application by adding this
+ * filter is not so high, because parameter parsing does check content type
+ * of the request before consuming the request body.
  */
 public class FailedRequestFilter extends FilterBase {
 


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

[tomcat] branch master updated: Update Tomcat 9 to Tomact 10

2020-09-29 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 6107934  Update Tomcat 9 to Tomact 10
6107934 is described below

commit 6107934e05b495110a8230c91a537ef80f9b275c
Author: Mark Thomas 
AuthorDate: Tue Sep 29 12:45:26 2020 +0100

Update Tomcat 9 to Tomact 10
---
 CONTRIBUTING.md   |  1 +
 README.md |  2 ++
 java/org/apache/tomcat/util/compat/JreCompat.java |  2 +-
 webapps/docs/architecture/project.xml |  4 ++--
 webapps/docs/changelog.xml|  5 +
 webapps/docs/config/cluster-interceptor.xml   |  2 +-
 webapps/docs/config/cluster-membership.xml| 14 ++
 webapps/docs/config/http.xml  | 20 ++--
 webapps/docs/config/listeners.xml |  6 +-
 webapps/docs/config/project.xml   |  4 ++--
 webapps/docs/rewrite.xml  |  2 +-
 11 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f0157a0..3484864 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,6 +76,7 @@ manually generate the patch file by using diff. If this is 
what you want, you
 can download the sources from the "Source Code Distributions" section of the
 Download Page. There is one such page for every major Tomcat version:
 
+- [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
 - [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
diff --git a/README.md b/README.md
index 9a8e002..ec1353d 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ project logo are trademarks of the Apache Software Foundation.
 For every major Tomcat version there is one download page containing
 links to the latest binary and source code downloads, but also
 links for browsing the download directories and archives:
+- [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
 - [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
@@ -42,6 +43,7 @@ The documentation available as of the date of this release is
 included in the docs webapp which ships with tomcat. You can access that webapp
 by starting tomcat and visiting  in your browser.
 The most up-to-date documentation for each version can be found at:
+- [Tomcat 10](https://tomcat.apache.org/tomcat-10.0-doc/)
 - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/)
 - [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/)
 - [Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/)
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java 
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 099ee87..1b79e28 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -50,7 +50,7 @@ public class JreCompat {
 protected static final Method getApplicationProtocolMethod;
 
 static {
-// This is Tomcat 9 with a minimum Java version of Java 8.
+// This is Tomcat 10 with a minimum Java version of Java 8.
 // Look for the highest supported JVM first
 if (GraalCompat.isSupported()) {
 instance = new GraalCompat();
diff --git a/webapps/docs/architecture/project.xml 
b/webapps/docs/architecture/project.xml
index 7bf0c73..0589be6 100644
--- a/webapps/docs/architecture/project.xml
+++ b/webapps/docs/architecture/project.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-https://tomcat.apache.org/;>
 
-Apache Tomcat 9 Architecture
+Apache Tomcat 10 Architecture
 
 
   The Apache Tomcat Servlet/JSP Container
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8dc1aba..f966a93 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -152,6 +152,11 @@
 clarify when a user may wish to deploy additional instances of the
 Manager web application. (markt)
   
+  
+64774: Review references to Tomcat 9 in the the 
documentation
+web application and remove them or upadte them to refer to Tomact 10 as
+appropriate. (markt)
+  
 
   
   
diff --git a/webapps/docs/config/cluster-interceptor.xml 
b/webapps/docs/config/cluster-interceptor.xml
index 836c4cd..2dfc362 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -200,7 +200,7 @@
   

  The EncryptInterceptor adds encryption to the channel messages carrying
- session data between

[tomcat] branch master updated: Update to CXF 3.4.0

2020-09-24 Thread 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 d2f30cf  Update to CXF 3.4.0
 new 38e42dd  Merge branch 'master' of g...@github.com:apache/tomcat.git
d2f30cf is described below

commit d2f30cf0760c0ef3f6a2b3945411618fe8411a46
Author: remm 
AuthorDate: Thu Sep 24 15:08:06 2020 +0200

Update to CXF 3.4.0
---
 modules/cxf/pom.xml| 10 --
 webapps/docs/changelog.xml |  3 +++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 220ae64..aa869ad 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,7 +29,7 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.3.6
+3.4.0
 jar
 
 
@@ -127,11 +127,9 @@
 
 
jakarta.annotation:jakarta.annotation-api

jakarta.el:*
-
javax.annotation:javax.annotation-api
-javax.el:*
-   
javax.enterprise:cdi-api
-   
javax.inject:*
-   
javax.interceptor:*
+   
jakarta.enterprise:jakarta.enterprise.cdi-api
+   
jakarta.inject:*
+   
jakarta.interceptor:*


org.apache.ant:*

org.codehaus.woodstox:*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a6d3b84..f58a592 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -159,6 +159,9 @@
   
 Update the OWB module to Apache OpenWebBeans 2.0.18. (remm)
   
+  
+Update the CXF module to Apache CXF 3.4.0. (remm)
+  
 
   
 


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

[tomcat] branch master updated: Update version numbers

2020-09-24 Thread 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 6e509a8  Update version numbers
6e509a8 is described below

commit 6e509a856bfb9c2912b7451183f851afe77ed67a
Author: remm 
AuthorDate: Thu Sep 24 10:12:10 2020 +0200

Update version numbers
---
 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 f1c84a3..c8dfa78 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-M7
-
+10.0.0-M8
+
 
 
 


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

[tomcat] branch master updated: Update changelog

2020-09-17 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 564ab41  Update changelog
564ab41 is described below

commit 564ab41f167f35a9a8c04903f865049b50f6b3f3
Author: Mark Thomas 
AuthorDate: Thu Sep 17 19:53:54 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 17 +
 1 file changed, 17 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3076f9b..5ed18f9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -81,6 +81,15 @@
   
 
   
+  
+
+  
+Use lazy instantiation to improve the performance when working with
+listeners added to the ELContext. Pull request provided by
+Thomas Andraschko. (markt)
+  
+
+  
   
 
   
@@ -103,6 +112,14 @@
 When building, only rebuild JAR files (including OSGi and JPMS 
metadata)
 if the contents has changed. (markt)
   
+  
+Improvements to Chinese translations. Pull request provided by Yang
+Yang. (markt)
+  
+  
+Expand coverage of Russian translations. Pull request provided by
+Nikolay Gribanov. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Update changelog

2020-09-15 Thread 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.git


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

commit d94684a96f18acd307d00e7b217cdef7b0250f24
Author: Mark Thomas 
AuthorDate: Tue Sep 15 16:02:31 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9936d7c..4c72b3a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,6 +55,9 @@
 Fix race condition when saving and recycling session in
 PersistentValve. (kfujino)
   
+  
+Remove the JDBCRealm. (markt)
+  
 
   
   


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

[tomcat] branch master updated: Update Tomcat Native to 1.2.25

2020-09-07 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 4ced1c0  Update Tomcat Native to 1.2.25
4ced1c0 is described below

commit 4ced1c0b246339eda067637d6b873b07d37e9e9d
Author: Mark Thomas 
AuthorDate: Mon Sep 7 12:20:44 2020 +0100

Update Tomcat Native to 1.2.25
---
 build.properties.default   | 6 +++---
 webapps/docs/changelog.xml | 4 
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 565eb53..57ec1c6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -145,13 +145,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.24
+tomcat-native.version=1.2.25
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
+tomcat-native.src.checksum.value=e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=c2d581f1f602dce61abc36370ce485c805b90863301555fc3d44362b655f34f950d0096fad22895374086f33d4505792c27f83fe35d4aeb87a08215bea8ae74a
+tomcat-native.win.checksum.value=0171a7ff3db708c2051e1f7a188286c5174091e208e1822c3027dd7aa415562c94be8d397a61bbe57bf9ee40ab52e1b346123fb7f2b170a43c60e8596eb65618
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ca23cb0..ad9e1d2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -273,6 +273,10 @@
 Update the internal fork of Apache Commons DBCP to 6d232e5 (2020-08-11,
 2.8.0-SNAPSHOT). Code clean-up various bug fixes. (markt)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.25.
+(markt)
+  
 
   
 


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

[tomcat] branch master updated: Update Commons Pool to 2.8.1

2020-08-26 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 253283a  Update Commons Pool to 2.8.1
253283a is described below

commit 253283a5927a449bb10ba4396b8eb41680b78132
Author: Mark Thomas 
AuthorDate: Wed Aug 26 14:09:38 2020 +0100

Update Commons Pool to 2.8.1
---
 MERGE.txt  |  10 +-
 .../dbcp/pool2/BaseKeyedPooledObjectFactory.java   |   4 +-
 .../apache/tomcat/dbcp/pool2/BaseObjectPool.java   |   8 +-
 .../tomcat/dbcp/pool2/BasePooledObjectFactory.java |   2 +-
 .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java  |  44 ++---
 .../dbcp/pool2/KeyedPooledObjectFactory.java   |  16 +-
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  |  10 +-
 java/org/apache/tomcat/dbcp/pool2/PoolUtils.java   |  70 ---
 .../org/apache/tomcat/dbcp/pool2/PooledObject.java |   4 +-
 .../tomcat/dbcp/pool2/PooledObjectFactory.java |  12 +-
 .../tomcat/dbcp/pool2/impl/AbandonedConfig.java|  10 +-
 .../dbcp/pool2/impl/BaseGenericObjectPool.java | 213 -
 .../dbcp/pool2/impl/BaseObjectPoolConfig.java  |   6 +-
 .../tomcat/dbcp/pool2/impl/CallStackUtils.java |   6 +-
 .../dbcp/pool2/impl/DefaultPooledObject.java   |   4 +-
 .../pool2/impl/DefaultPooledObjectInfoMBean.java   |   6 +-
 .../tomcat/dbcp/pool2/impl/EvictionPolicy.java |   4 +-
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  | 118 ++--
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java|  40 ++--
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  |  24 +--
 .../dbcp/pool2/impl/LinkedBlockingDeque.java   |  33 +---
 .../dbcp/pool2/impl/SecurityManagerCallStack.java  |   2 +-
 .../dbcp/pool2/impl/SoftReferenceObjectPool.java   |  16 +-
 23 files changed, 392 insertions(+), 270 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 088393b..79fc82e 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -42,7 +42,7 @@ Codec
 -
 Sub-tree:
 src/main/java/org/apache/commons/codec
-The SHA1 ID for the most recent commit to be merged to Tomcat is:
+The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
 53c93d0ffccb65d182306c74d1230ce814889dc1 (2020-08-18)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
@@ -50,7 +50,7 @@ FileUpload
 --
 Sub-tree:
 src/main/java/org/apache/commons/fileupload2
-The SHA1 ID for the most recent commit to be merged to Tomcat is:
+The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
 c25a4e33553a5f098ab6065a54e1ae7985025d26 (2020-08-26)
 
 Note: Tomcat's copy of fileupload also includes classes copied manually from
@@ -61,12 +61,12 @@ DBCP
 Pool2
 Sub-tree
 src/main/java/org/apache/commons/pool2
-The SHA1 ID for the most recent commit to be merged to Tomcat is:
-6092f924b36061353ff92b18c88400ab3bc05327 (2019-12-06)
+The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
+rel/commons-pool-2.8.1
 
 DBCP2
 Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
-The SHA1 ID for the most recent commit to be merged to Tomcat is:
+The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
 a363906bf7a039f79c07fa3c68b082a69ae035d7 (2019-12-06)
diff --git 
a/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java 
b/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
index dfbc5a9..b0f0c34 100644
--- a/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
+++ b/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
@@ -17,7 +17,7 @@
 package org.apache.tomcat.dbcp.pool2;
 
 /**
- * A base implementation of KeyedPooledObjectFactory.
+ * A base implementation of {@code KeyedPooledObjectFactory}.
  * 
  * All operations defined here are essentially no-op's.
  * 
@@ -85,7 +85,7 @@ public abstract class BaseKeyedPooledObjectFactory 
extends BaseObject
  *
  * @param key the key used when selecting the object
  * @param p a {@code PooledObject} wrapping the instance to be validated
- * @return always true in the default implementation
+ * @return always {@code true} in the default implementation
  */
 @Override
 public boolean validateObject(final K key, final PooledObject p) {
diff --git a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java 
b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
index df23b12..d17b494 100644
--- a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
@@ -85,8 +85,8 @@ public abstract class BaseObjectPool extends BaseObject 
implements ObjectPool
 /**
  * {@inheritDoc}
  * 
- * This affects the behavior of isClosed and
- * assertOpen.
+ * This affects the behavior of {@code isClosed} and
+ * {@code assertOpen}.

[tomcat] branch master updated: Update Commons FileUpload to latest

2020-08-26 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 38cc914  Update Commons FileUpload to latest
38cc914 is described below

commit 38cc9148a9e0614330a71d247bd97ffdf523797f
Author: Mark Thomas 
AuthorDate: Wed Aug 26 11:27:45 2020 +0100

Update Commons FileUpload to latest
---
 MERGE.txt  |   2 +-
 .../tomcat/util/http/fileupload/FileItem.java  |  30 ++---
 .../util/http/fileupload/FileItemFactory.java  |   4 +-
 .../util/http/fileupload/FileItemHeaders.java  |  28 ++---
 .../util/http/fileupload/FileItemStream.java   |  12 +-
 .../tomcat/util/http/fileupload/FileUpload.java|   6 +-
 .../util/http/fileupload/FileUploadBase.java   |  63 +-
 .../util/http/fileupload/FileUploadException.java  |  34 +-
 .../util/http/fileupload/MultipartStream.java  |  96 +++
 .../util/http/fileupload/ParameterParser.java  |   8 +-
 .../util/http/fileupload/disk/DiskFileItem.java|  46 +++
 .../http/fileupload/disk/DiskFileItemFactory.java  |   8 +-
 .../http/fileupload/impl/FileItemIteratorImpl.java |  18 ++-
 .../http/fileupload/impl/FileItemStreamImpl.java   |   8 +-
 .../impl/FileSizeLimitExceededException.java   |   2 +-
 .../fileupload/impl/FileUploadIOException.java |   2 +-
 .../impl/InvalidContentTypeException.java  |   6 +-
 .../impl/SizeLimitExceededException.java   |   2 +-
 .../tomcat/util/http/fileupload/package-info.java  |   2 +-
 .../http/fileupload/servlet/ServletFileUpload.java |  18 +--
 .../util/http/fileupload/servlet/package-info.java |   2 +-
 .../http/fileupload/util/FileItemHeadersImpl.java  |   8 +-
 .../http/fileupload/util/LimitedInputStream.java   |  32 ++---
 .../tomcat/util/http/fileupload/util/Streams.java  |   9 +-
 .../http/fileupload/util/mime/RFC2231Utility.java  | 133 +
 webapps/docs/changelog.xml |   4 +
 26 files changed, 370 insertions(+), 213 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index fd084e5..088393b 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,7 +51,7 @@ FileUpload
 Sub-tree:
 src/main/java/org/apache/commons/fileupload2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-2317552993fd5180a84083d599b8cbdb05a07bab (2019-12-06)
+c25a4e33553a5f098ab6065a54e1ae7985025d26 (2020-08-26)
 
 Note: Tomcat's copy of fileupload also includes classes copied manually from
   Commons IO.
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java 
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b69a51e..b7bdb55 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -24,7 +24,7 @@ import java.io.UnsupportedEncodingException;
 
 /**
  *  This class represents a file or form item that was received within a
- * multipart/form-data POST request.
+ * {@code multipart/form-data} POST request.
  *
  *  After retrieving an instance of this class from a {@link
  * org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see
@@ -36,11 +36,11 @@ import java.io.UnsupportedEncodingException;
  * it into memory, which may come handy with large files.
  *
  *  While this interface does not extend
- * javax.activation.DataSource per se (to avoid a seldom used
+ * {@code javax.activation.DataSource} per se (to avoid a seldom used
  * dependency), several of the defined methods are specifically defined with
  * the same signatures as methods in that interface. This allows an
  * implementation of this interface to also implement
- * javax.activation.DataSource with minimal additional work.
+ * {@code javax.activation.DataSource} with minimal additional work.
  *
  * @since 1.3 additionally implements FileItemHeadersSupport
  */
@@ -60,10 +60,10 @@ public interface FileItem extends FileItemHeadersSupport {
 InputStream getInputStream() throws IOException;
 
 /**
- * Returns the content type passed by the browser or null if
+ * Returns the content type passed by the browser or {@code null} if
  * not defined.
  *
- * @return The content type passed by the browser or null if
+ * @return The content type passed by the browser or {@code null} if
  * not defined.
  */
 String getContentType();
@@ -88,8 +88,8 @@ public interface FileItem extends FileItemHeadersSupport {
  * Provides a hint as to whether or not the file contents will be read
  * from memory.
  *
- * @return true if the file contents will be read from memory;
- * false otherwise.
+ * @return {@code true} if the file contents will be read from memory;
+ * {@code false} otherwise.
  */
 boolean isInMemory();
 
@@ -141,7 +141,7 @@ public

[tomcat] branch master updated: Update Commons Codec to latest

2020-08-25 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new edf149b  Update Commons Codec to latest
edf149b is described below

commit edf149b938c867e50dc9a7e0df5d6ade312ca84e
Author: Mark Thomas 
AuthorDate: Tue Aug 25 19:15:06 2020 +0100

Update Commons Codec to latest
---
 MERGE.txt  |2 +-
 .../apache/tomcat/util/codec/binary/Base64.java| 1013 ++--
 .../tomcat/util/codec/binary/BaseNCodec.java   |  453 -
 .../tomcat/util/codec/binary/StringUtils.java  |   42 +-
 webapps/docs/changelog.xml |4 +
 5 files changed, 767 insertions(+), 747 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index d63a3ca..fd084e5 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -43,7 +43,7 @@ Codec
 Sub-tree:
 src/main/java/org/apache/commons/codec
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-9637dd44fa0e2d5a6ddb45791e3cd78298842d95 (2019-12-06)
+53c93d0ffccb65d182306c74d1230ce814889dc1 (2020-08-18)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
 FileUpload
diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 72cfd54..2b5c7d4 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -61,17 +61,6 @@ public class Base64 extends BaseNCodec {
 private static final int BYTES_PER_ENCODED_BLOCK = 4;
 
 /**
- * Chunk separator per RFC 2045 section 2.1.
- *
- * 
- * N.B. The next major release may break compatibility and make this field 
private.
- * 
- *
- * @see http://www.ietf.org/rfc/rfc2045.txt;>RFC 2045 section 
2.1
- */
-static final byte[] CHUNK_SEPARATOR = {'\r', '\n'};
-
-/**
  * This array is a lookup table that translates 6-bit positive integer 
index values into their "Base64 Alphabet"
  * equivalents as specified in Table 1 of RFC 2045.
  *
@@ -149,367 +138,211 @@ public class Base64 extends BaseNCodec {
 // some state be preserved between calls of encode() and decode().
 
 /**
- * Encode table to use: either STANDARD or URL_SAFE. Note: the 
DECODE_TABLE above remains static because it is able
- * to decode both STANDARD and URL_SAFE streams, but the encodeTable must 
be a member variable so we can switch
- * between the two modes.
+ * Decodes Base64 data into octets.
+ * 
+ * Note: this method seamlessly handles data encoded in URL-safe or 
normal mode.
+ * 
+ *
+ * @param base64Data
+ *Byte array containing Base64 data
+ * @return Array containing decoded data.
  */
-private final byte[] encodeTable;
-
-// Only one decode table currently; keep for consistency with Base32 code
-private final byte[] decodeTable;
+public static byte[] decodeBase64(final byte[] base64Data) {
+return decodeBase64(base64Data, 0, base64Data.length);
+}
 
-/**
- * Line separator for encoding. Not used when decoding. Only used if 
lineLength  0.
- */
-private final byte[] lineSeparator;
+public  static byte[] decodeBase64(
+final byte[] base64Data, final int off, final int len) {
+return new Base64().decode(base64Data, off, len);
+}
 
 /**
- * Convenience variable to help us determine when our buffer is going to 
run out of room and needs resizing.
- * decodeSize = 3 + lineSeparator.length;
+ * Decodes a Base64 String into octets.
+ * 
+ * Note: this method seamlessly handles data encoded in URL-safe or 
normal mode.
+ * 
+ *
+ * @param base64String
+ *String containing Base64 data
+ * @return Array containing decoded data.
+ * @since 1.4
  */
-private final int decodeSize;
+public static byte[] decodeBase64(final String base64String) {
+return new Base64().decode(base64String);
+}
 
-/**
- * Convenience variable to help us determine when our buffer is going to 
run out of room and needs resizing.
- * encodeSize = 4 + lineSeparator.length;
- */
-private final int encodeSize;
+public static byte[] decodeBase64URLSafe(final String base64String) {
+return new Base64(true).decode(base64String);
+}
 
+// Implementation of integer encoding used for crypto
 /**
- * Creates a Base64 codec used for decoding (all modes) and encoding in 
URL-unsafe mode.
- * 
- * When encoding the line length is 0 (no chunking), and the encoding 
table is STANDARD_ENCODE_TABLE.
- * 
+ * Decodes a byte64-encoded integer according to crypto standards such as 
W3C's XML-Signature.
  *
- * 
- * When decoding all variants are supported.

[tomcat] branch master updated: Update BCEL to 6.5.0 - code clean-up only

2020-08-25 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new f76278a  Update BCEL to 6.5.0 - code clean-up only
f76278a is described below

commit f76278ae2e601f574ffa49d0298882e8d101aa38
Author: Mark Thomas 
AuthorDate: Tue Aug 25 16:45:20 2020 +0100

Update BCEL to 6.5.0 - code clean-up only
---
 MERGE.txt  |  4 +--
 java/org/apache/tomcat/util/bcel/Const.java| 40 +++---
 .../bcel/classfile/AnnotationElementValue.java |  2 +-
 .../util/bcel/classfile/AnnotationEntry.java   | 16 -
 .../tomcat/util/bcel/classfile/Annotations.java| 12 +++
 .../util/bcel/classfile/ArrayElementValue.java | 14 
 .../tomcat/util/bcel/classfile/ClassParser.java| 40 +++---
 .../tomcat/util/bcel/classfile/ConstantClass.java  |  6 ++--
 .../tomcat/util/bcel/classfile/ConstantPool.java   | 18 +-
 .../tomcat/util/bcel/classfile/ElementValue.java   |  2 +-
 .../util/bcel/classfile/EnumElementValue.java  |  2 +-
 .../tomcat/util/bcel/classfile/JavaClass.java  | 38 ++--
 .../util/bcel/classfile/SimpleElementValue.java|  2 +-
 .../apache/tomcat/util/bcel/classfile/Utility.java |  6 ++--
 java/org/apache/tomcat/util/bcel/package.html  |  2 +-
 webapps/docs/changelog.xml |  4 +++
 16 files changed, 106 insertions(+), 102 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 5551fb2..d63a3ca 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -35,8 +35,8 @@ BCEL
 
 Sub-tree:
 src/main/java/org/apache/bcel
-The SHA1 ID for the most recent commit to be merged to Tomcat is:
-ff6941e4491c68f6eaf270ff03c1bc1e554c7b42 (2019-12-06)
+The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
+rel/commons-bcel-6.5.0
 
 Codec
 -
diff --git a/java/org/apache/tomcat/util/bcel/Const.java 
b/java/org/apache/tomcat/util/bcel/Const.java
index bfaeb42..ad19386 100644
--- a/java/org/apache/tomcat/util/bcel/Const.java
+++ b/java/org/apache/tomcat/util/bcel/Const.java
@@ -23,13 +23,13 @@ package org.apache.tomcat.util.bcel;
 public final class Const {
 
 /** One of the access flags for fields, methods, or classes.
- *  @see http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.1-200-E.1;>
+ *  @see https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.1-200-E.1;>
  *  Flag definitions for Classes in the Java Virtual Machine Specification 
(Java SE 9 Edition).
- *  @see http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.5;>
+ *  @see https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.5;>
  *  Flag definitions for Fields in the Java Virtual Machine Specification 
(Java SE 9 Edition).
- *  @see http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.6;>
+ *  @see https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.6;>
  *  Flag definitions for Methods in the Java Virtual Machine Specification 
(Java SE 9 Edition).
- *  @see http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1;>
+ *  @see https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1;>
  *  Flag definitions for Inner Classes in the Java Virtual Machine 
Specification (Java SE 9 Edition).
  */
 public static final short ACC_FINAL  = 0x0010;
@@ -48,91 +48,91 @@ public final class Const {
 
 /**
  * Marks a constant pool entry as type UTF-8.
- * @see  http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.7;>
+ * @see  https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.7;>
  * The Constant Pool in The Java Virtual Machine Specification
  */
 public static final byte CONSTANT_Utf8   = 1;
 
 /**
  * Marks a constant pool entry as type Integer.
- * @see  http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4;>
+ * @see  https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4;>
  * The Constant Pool in The Java Virtual Machine Specification
  */
 public static final byte CONSTANT_Integer= 3;
 
 /**
  * Marks a constant pool entry as type Float.
- * @see  http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4;>
+ * @see  https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4;>
  * The Constant Pool in The Java Virtual Machine Specification
  */
 public static final byte CONSTANT_Float  = 4;
 
 /**
  * Marks a constant pool entry as type Long.
- * @see  http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5;>
+ * @see

[tomcat] branch master updated: Update changelog

2020-08-17 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 1284f25  Update changelog
1284f25 is described below

commit 1284f25a9c2c954215a47048ca7ecd1a75201465
Author: Mark Thomas 
AuthorDate: Mon Aug 17 20:06:22 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1d41688..5908d93 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -96,22 +96,23 @@
 return value, particularly when end of stream has been reached. (markt)
   
   
-Avoid several potential NPEs introduced in the changes in the previous
-release to reduce the memory footprint of closed HTTP/2 streams. 
(markt)
-  
-  
 Refactor the stopping of the acceptor to ensure that the acceptor 
thread
 stops when a connector is started immediately after it is stopped.
 (markt)
   
   
+64621: Improve handling HTTP/2 stream reset frames received
+from clients. (markt)
+  
+  
 64660: Avoid a potential NPE in the AprEndpoint if a socket
 is closed in one thread at the same time as the poller is processing an
 event for that socket in another. (markt)
   
   
-64621: Improve handling HTTP/2 stream reset frames received
-from clients. (markt)
+64671: Avoid several potential NPEs introduced in the 
changes
+in the previous release to reduce the memory footprint of closed HTTP/2
+streams. (markt)
   
 
   


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

[tomcat] branch master updated: Update changelog

2020-08-11 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 7110da9  Update changelog
7110da9 is described below

commit 7110da969c3460613c2c9c36a4549ec80a68aa44
Author: Mark Thomas 
AuthorDate: Tue Aug 11 17:12:23 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 53adb16..cea1d8b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,10 @@
 Rename the local copy of the javax.xml.ws package to
 jakarta.xml.ws. (markt)
   
+  
+Improve the quality of the Japanese translations provided with Apache
+Tomcat. Includes contributions from Yuki Shira. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Update reqparams.html

2020-07-09 Thread mgrigorov

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

mgrigorov 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 6c992e2  Update reqparams.html
 new 6ff8911  Merge pull request #320 from javierlete/patch-1
6c992e2 is described below

commit 6c992e2b9ef09d7d7ce282630321084834f6a4ae
Author: javierlete 
AuthorDate: Wed Jul 8 10:52:16 2020 +0200

Update reqparams.html

Added the request.getParameter that were missing.
---
 webapps/examples/servlets/reqparams.html | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/examples/servlets/reqparams.html 
b/webapps/examples/servlets/reqparams.html
index 4b9695d..9cc8353 100644
--- a/webapps/examples/servlets/reqparams.html
+++ b/webapps/examples/servlets/reqparams.html
@@ -44,6 +44,10 @@
 out.println(body);
 out.println(h3Request Parameters 
Example/h3);
 out.println(Parameters in this 
request:br);
+
+String firstName = request.getParameter("firstname");
+String lastName = request.getParameter("lastname");
+
 if (firstName != null || lastName != null) {
 out.println(First Name:);
 out.println( =  + 
HTMLFilter.filter(firstName) + br);


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

[tomcat] branch master updated: Update changelog

2020-07-07 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 3545d92  Update changelog
3545d92 is described below

commit 3545d92c398c7a526576b241ea810d5ab3cbf584
Author: Mark Thomas 
AuthorDate: Tue Jul 7 14:51:36 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cd84d7c..127f98f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,10 +45,20 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Requests received via proxies may be marked as using the 
ws
+or wss protocol rather than http or
+https. Ensure that such requests are not rejected. PR
+provided by Ronny Perinke. (markt)
+  
+
+  
   
 
   
-Remove the localization of the text output of the Manager application 
+Remove the localization of the text output of the Manager application
 list of contexts and the Host Manager application list of hosts so that
 the output is more consistent. PR provided by Holomark. (markt)
   


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

[tomcat] branch master updated: Update

2020-07-07 Thread 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.git


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

commit 6d83d068699c3d4ad18cd69f01f38d9c81972cb5
Author: Mark Thomas 
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

Update
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fc799f2..cd84d7c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the localization of the text output of the Manager application 
+list of contexts and the Host Manager application list of hosts so that
+the output is more consistent. PR provided by Holomark. (markt)
+  
+
+  
 
 
   


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

[tomcat] branch master updated: Update changelog to verify Java version in CI

2020-07-03 Thread 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 7414188  Update changelog to verify Java version in CI
7414188 is described below

commit 7414188065876a79ce42d22776dc76ff58cea65c
Author: remm 
AuthorDate: Fri Jul 3 08:55:17 2020 +0200

Update changelog to verify Java version in CI
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fcd4cc8..16e4fb2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove ALPN abstraction to simplify code. Tomcat now requires
+Java 8 251 or 252 for TLS support. (remm)
+  
+
+  
 
 
   


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

[tomcat] branch master updated: Update Graal documentation to reflect changes

2020-06-25 Thread 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 6a3cae6  Update Graal documentation to reflect changes
6a3cae6 is described below

commit 6a3cae6adf866a40eed8df3a571253bc295ec421
Author: remm 
AuthorDate: Thu Jun 25 14:57:54 2020 +0200

Update Graal documentation to reflect changes
---
 webapps/docs/graal.xml | 70 ++
 1 file changed, 48 insertions(+), 22 deletions(-)

diff --git a/webapps/docs/graal.xml b/webapps/docs/graal.xml
index 0852595..b89dc1d 100644
--- a/webapps/docs/graal.xml
+++ b/webapps/docs/graal.xml
@@ -35,7 +35,7 @@
   
 
   
-Tomcat supports using the GraalVM Native Image tool to produce
+Tomcat supports using the GraalVM/Mandrel Native Image tool to produce
 a native binary including the container. This documentation page
 describes the build process of such an image.
   
@@ -49,21 +49,31 @@
 the process will use the Maven shade plugin JAR packaging (fat JAR). The
 idea is to produce a single JAR that contains all necessary classes from
 Tomcat, the webapps and all additional dependencies. Although Tomcat has
-received compatibility fixes to support GraalVM native images, any library
+received compatibility fixes to support native images, any library
 may not be compatible and may require replacement code (the GraalVM
 documentation has more details about this).
   
 
   
-Download and install GraalVM. The first step is then to add the
-native-image tool.
-export JAVA_HOME=/absolute...path...to/graalvm-ce-javaX-x.y.z
+Download and install GraalVM or Mandrel.
+  
+
+  
+   If using GraalVM, the first step is then to add the Native Image tool.
+   export JAVA_HOME=/absolute...path...to/graalvm-ce-javaX-x.y.z
 cd $JAVA_HOME/bin
 ./gu install native-image
-Download the Tomcat Maven packaging from
-https://github.com/apache/tomcat/tree/master/res/tomcat-maven and place
-all the files in a folder (named tomcat-maven in this documentation.
-export TOMCAT_MAVEN=/absolute...path...to/tomcat-maven
+   Mandrel already includes the Native Image tool ready to use, so this
+   step can be skipped. Only JAVA_HOME must be set to the mandrelJDK folder,
+   such as:
+   export 
JAVA_HOME=/absolute...path...to/mandrel-javaXX-platform-x.x.x.x
+  
+
+  
+Download the Tomcat Stuffed module from
+https://github.com/apache/tomcat/tree/master/modules/stuffed and place
+all the files in a folder stuffed in this documentation.
+export TOMCAT_STUFFED=/absolute...path...to/stuffed
 The build process now requires both Ant and Maven.
   
 
@@ -72,7 +82,7 @@ cd $JAVA_HOME/bin
   
 
   
-Inside the tomcat-maven folder, the directory structure is the same as for
+Inside the tomcat-stuffed folder, the directory structure is the same as 
for
 regular Tomcat. The main configuration files are placed in the conf folder,
 and if using the default server.xml the webapps are placed in the webapps
 folder.
@@ -81,14 +91,28 @@ cd $JAVA_HOME/bin
   
 The first step is to build the fat Tomcat JAR with all dependencies.
 Any JSP in the webapp must all be precompiled and packaged.
-cd $TOMCAT_MAVEN
+cd $TOMCAT_STUFFED
 mvn package
-ant -Dwebapp.name=somewebapp -f graal-webapp.ant.xml
+ant -Dwebapp.name=somewebapp -f webapp-jspc.ant.xml
 Dependencies for the webapp should now be added to the main pom.xml,
 following with building the complete fat JAR.
 mvn package
   
 
+  
+As it is best to avoid using reflection whenever possible with Ahead of
+Time compilation, it can be a good idea to generate and compile Tomcat
+Embedded code out of the main server.xml configuration as well as the
+context.xml files used to configure the contexts.
+$JAVA_HOME/bin/java\
+-Dcatalina.base=. 
-Djava.util.logging.config.file=conf/logging.properties\
+-jar target/tomcat-stuffed-1.0.jar --catalina -generateCode 
src/main/java
+mvn package
+The rest of the process described here will assume this step was done and
+the --catalina -useGeneratedCode arguments are added to the
+command lines. If this was not the case, they should be removed.
+  
+
   
 
   
@@ -103,9 +127,9 @@ ant -Dwebapp.name=somewebapp -f 
graal-webapp.ant.xml
   
 Run the GraalVM substrate VM using the trace agent:
 $JAVA_HOME/bin/java\
--agentlib:native-image-agent=config-output-dir=$TOMCAT_MAVEN/target/\
+-agentlib:native-image-agent=config-output-dir=$TOMCAT_STUFFED/target/\
 -Dcatalina.base=. 
-Djava.util.logging.config.file=conf/logging.properties\
--jar target/tomcat-maven-1.0.jar
+-jar target/tomcat-stuffed-1.0.jar --catalina 
-useGeneratedCode
   
 
   
@@ -136,18 +160,18 @@ ant

[tomcat] branch master updated: Update to OWB 2.0.17

2020-06-15 Thread 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 eeafcd7  Update to OWB 2.0.17
eeafcd7 is described below

commit eeafcd76feaae0558e0e6c60ac4d9ad00b3d221b
Author: remm 
AuthorDate: Mon Jun 15 15:18:58 2020 +0200

Update to OWB 2.0.17

Use the new shade plugin version, it seems to work properly now. Simply
some items ... But add new stuff due to new warnings.
---
 modules/owb/pom.xml| 34 --
 webapps/docs/changelog.xml |  3 +++
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 1a58c67..2fd627b 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.16
+2.0.17
 jar
 
 
 1.0
 1.0
 1.0.1
-10.0.0-M3
+10.0.0-M6
 
 
 
@@ -80,7 +80,6 @@
 
 
 
-
 
 
 
@@ -95,8 +94,7 @@
 
 org.apache.maven.plugins
 maven-shade-plugin
-3.2.1
-
+3.2.4
 
 
 package
@@ -106,23 +104,23 @@
 
 
false
 
-
-
-
-${mainClass}
-
+
+
+
+
 
+
+
+*:*
+
+
META-INF/DEPENDENCIES
+META-INF/MANIFEST.MF
+
+
+
 
 
 
-
-
-
-org.apache.openwebbeans
-openwebbeans-maven
-${project.version}
-
-
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61c628c..de814bc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,6 +103,9 @@
 64515: Bnd files don't need to be filtered (save some work).
 Pull request provided by Raymond Augé. (markt)
   
+  
+Update the OWB module to Apache OpenWebBeans 2.0.17. (remm)
+  
 
   
 


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

[tomcat] branch master updated: Update the checksum of cglib and objenesis

2020-06-09 Thread mgrigorov

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

mgrigorov 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 bf5d2be  Update the checksum of cglib and objenesis
bf5d2be is described below

commit bf5d2bec3fbd25a858333530f3bb9bffb4e7c00a
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Jun 9 17:05:56 2020 +0300

Update the checksum of cglib and objenesis

I've forgot to copy those from my build.properties to 
build.properties.default
---
 build.properties.default | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index cb7fb11..48fb990 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -233,8 +233,8 @@ 
easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymoc
 # - cglib, used by EasyMock, version 2.2 or later -
 cglib.version=3.3.0
 cglib.checksum.enabled=true
-cglib.checksum.algorithm=MD5|SHA-1
-cglib.checksum.value=af93e373d7ddf35db0e9612480d9ed13|00d456bb230c70c0b95c76fb28e429d42f275941
+cglib.checksum.algorithm=SHA-512
+cglib.checksum.value=faa1d2121e87ae69e179e3aae217accd0834e0da716b91a029fd526e192612e71675f2740bedf48e23ef1edc45f672a2be1b3e78bbfb1ad59c96dd3d2feeedba
 cglib.home=${base.path}/cglib-${cglib.version}
 cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
 
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
@@ -242,8 +242,8 @@ 
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cgl
 # - objenesis, used by EasyMock, version 1.2 or later -
 objenesis.version=3.1
 objenesis.checksum.enabled=true
-objenesis.checksum.algorithm=MD5|SHA-1
-objenesis.checksum.value=bee117291d50b41b8e8cf0ac5435df1d|bfcb0539a071a4c5a30690388903ac48c0667f2a
+objenesis.checksum.algorithm=SHA-512
+objenesis.checksum.value=4dcfc065d6ccc1e0cb716fc86d844e81a347591d06f99b1840157c51c58a842bdebe86f6bcacee65996b64468d21bdf3bcf463a7f4ae5261440c8f0f6fac8ab3
 objenesis.home=${base.path}/objenesis-${objenesis.version}
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar


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

[tomcat] branch master updated: Update cglib to 3.3.0 and objenesis to 3.1

2020-06-09 Thread mgrigorov

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

mgrigorov 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 eb8b48d  Update cglib to 3.3.0 and objenesis to 3.1
eb8b48d is described below

commit eb8b48da4fd1575148135eb4be421c0faca6e4c3
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Jun 9 16:17:01 2020 +0300

Update cglib to 3.3.0 and objenesis to 3.1
---
 build.properties.default| 4 ++--
 res/ide-support/eclipse/eclipse.classpath   | 4 ++--
 res/ide-support/idea/tomcat.iml | 4 ++--
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index be83155..cb7fb11 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -231,7 +231,7 @@ 
easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
 
easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymock-${easymock.version}.jar
 
 # - cglib, used by EasyMock, version 2.2 or later -
-cglib.version=2.2.2
+cglib.version=3.3.0
 cglib.checksum.enabled=true
 cglib.checksum.algorithm=MD5|SHA-1
 
cglib.checksum.value=af93e373d7ddf35db0e9612480d9ed13|00d456bb230c70c0b95c76fb28e429d42f275941
@@ -240,7 +240,7 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
 
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
 
 # - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=1.2
+objenesis.version=3.1
 objenesis.checksum.enabled=true
 objenesis.checksum.algorithm=MD5|SHA-1
 
objenesis.checksum.value=bee117291d50b41b8e8cf0ac5435df1d|bfcb0539a071a4c5a30690388903ac48c0667f2a
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 6689e9b..897a4b3 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -27,7 +27,7 @@
 
 
 
-
-
+
+
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 227c177..7d3e246 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -95,7 +95,7 @@
 
   
 
-  
+  
 
 
 
@@ -104,7 +104,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index e8f4147..bc3ff92 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index f4513f0..084b8f5 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest/hamcrest-2.2.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
 1.7
 
 


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

[tomcat] branch master updated: Update some more occurrences of hamcrest-core-1.3 to hamcrest-2.2

2020-06-09 Thread mgrigorov

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

mgrigorov 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 01e46e0  Update some more occurrences of hamcrest-core-1.3 to 
hamcrest-2.2
01e46e0 is described below

commit 01e46e0b5e33a0de091f13912418aec3976faa5d
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Jun 9 13:34:37 2020 +0300

Update some more occurrences of hamcrest-core-1.3 to hamcrest-2.2
---
 build.properties.default| 2 +-
 modules/jdbc-pool/build.properties.default  | 6 +++---
 res/ide-support/eclipse/eclipse.classpath   | 2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 88a9358..e838dae 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -218,7 +218,7 @@ hamcrest.checksum.enabled=true
 hamcrest.checksum.algorithm=SHA-512
 
hamcrest.checksum.value=6b1141329b83224f69f074cb913dbff6921d6b8693ede8d2599acb626481255dae63de42eb123cbd5f59a261ac32faae012be64e8e90406ae9215543fbca5546
 hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
-hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.jar=${hamcrest.home}/hamcrest-${hamcrest.version}.jar
 
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar
 
 # - EasyMock, version 3.2 or later -
diff --git a/modules/jdbc-pool/build.properties.default 
b/modules/jdbc-pool/build.properties.default
index c99ae56..753da45 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -71,10 +71,10 @@ junit.jar=${junit.home}/junit-${junit.version}.jar
 
junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
 
 # Hamcrest Library, used by JUnit
-hamcrest.version=1.3
+hamcrest.version=2.2
 hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
-hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
-hamcrest.loc=https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.jar=${hamcrest.home}/hamcrest-${hamcrest.version}.jar
+hamcrest.loc=https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar
 
 mysql.home=${base.path}/mysql-connector-java-5.1.12
 mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 36d4b68..2565faa 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -26,7 +26,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index beb4276..bbc48e0 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index c2809e7..43bb22f 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,9 +189,9 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+

[tomcat] branch master updated: Update Hamcrest to 2.2

2020-06-09 Thread mgrigorov

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

mgrigorov 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 c7ecf02  Update Hamcrest to 2.2
c7ecf02 is described below

commit c7ecf029e2de4fbb741dce8a5e6109d8010d0421
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Jun 9 11:33:01 2020 +0300

Update Hamcrest to 2.2

Use hamcrest.jar instead of hamcrest-core.jar
---
 build.properties.default | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 19a2f0b..88a9358 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -213,13 +213,13 @@ junit.jar=${junit.home}/junit-${junit.version}.jar
 
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
 
 # - Hamcrest Library, used by JUnit, version 1.3 or later 
-hamcrest.version=1.3
+hamcrest.version=2.2
 hamcrest.checksum.enabled=true
-hamcrest.checksum.algorithm=MD5|SHA-1
-hamcrest.checksum.value=6393363b47ddcbba82321110c3e07519|42a25dc3219429f0e5d060061f71acb49bf010a0
+hamcrest.checksum.algorithm=SHA-512
+hamcrest.checksum.value=6b1141329b83224f69f074cb913dbff6921d6b8693ede8d2599acb626481255dae63de42eb123cbd5f59a261ac32faae012be64e8e90406ae9215543fbca5546
 hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
 hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
-hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar
 
 # - EasyMock, version 3.2 or later -
 easymock.version=3.2


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

[tomcat] branch master updated: Update Hamcrest to 2.2

2020-06-09 Thread mgrigorov

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

mgrigorov 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 d9434f7  Update Hamcrest to 2.2
d9434f7 is described below

commit d9434f7686667b87cce0aad5c1377551f90f79c0
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Jun 9 10:11:00 2020 +0300

Update Hamcrest to 2.2
---
 build.properties.default | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 19a2f0b..5ff9cbe 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -213,10 +213,10 @@ junit.jar=${junit.home}/junit-${junit.version}.jar
 
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
 
 # - Hamcrest Library, used by JUnit, version 1.3 or later 
-hamcrest.version=1.3
+hamcrest.version=2.2
 hamcrest.checksum.enabled=true
-hamcrest.checksum.algorithm=MD5|SHA-1
-hamcrest.checksum.value=6393363b47ddcbba82321110c3e07519|42a25dc3219429f0e5d060061f71acb49bf010a0
+hamcrest.checksum.algorithm=SHA-512
+hamcrest.checksum.value=e6c3f02e25070177f8101f9ca265046f8c9569f82560051dbfb1e6a28c9937b1a7453f68e9a37bfce0eb69bacf45a743d16e78add931e98195d260b8a516557e
 hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
 hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
 
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar


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

[tomcat] branch master updated: Update Tomcat to use Jakarta EE 9 schema

2020-06-07 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 092badf  Update Tomcat to use Jakarta EE 9 schema
092badf is described below

commit 092badf63d7bc993b0efe48096f0e84b230d33db
Author: Mark Thomas 
AuthorDate: Sun Jun 7 20:16:31 2020 +0100

Update Tomcat to use Jakarta EE 9 schema
---
 LICENSE|  13 +-
 conf/web.xml   |   8 +-
 .../tomcat/util/descriptor/DigesterFactory.java|   9 +
 .../tomcat/util/descriptor/LocalResolver.java  |   3 +-
 .../tomcat/util/descriptor/XmlIdentifiers.java |   6 +
 .../apache/tomcat/util/descriptor/web/WebXml.java  |   7 +-
 res/INSTALLLICENSE |  13 +-
 res/META-INF/servlet-api.jar.license   | 286 +
 res/maven/tomcat-servlet-api.pom   |  15 +-
 res/rat/rat-excludes.txt   |  20 ++
 .../servlet/resources/TestSchemaValidation.java|  17 +-
 test/org/apache/jasper/TestJspC.java   |   8 +
 test/org/apache/jasper/compiler/TestJspConfig.java |  18 ++
 test/org/apache/jasper/compiler/TestValidator.java |  25 ++
 .../jasper/servlet/TestJspCServletContext.java |  13 +-
 .../tomcat/util/descriptor/web/TestWebXml.java |   2 +-
 .../web.xml => test/webapp-5.0/WEB-INF/tags11.tld  |  34 ++-
 .../web.xml => test/webapp-5.0/WEB-INF/tags12.tld  |  34 ++-
 .../web.xml => test/webapp-5.0/WEB-INF/tags20.tld  |  34 ++-
 .../web.xml => test/webapp-5.0/WEB-INF/tags21.tld  |  34 ++-
 {webapps/docs => test/webapp-5.0}/WEB-INF/web.xml  |  21 +-
 .../web.xml => test/webapp-5.0/el-as-literal.jsp   |  23 +-
 .../web.xml => test/webapp-5.0/tld-versions.jsp|  31 ++-
 test/webapp/WEB-INF/web.xml|   8 +-
 webapps/ROOT/WEB-INF/web.xml   |   8 +-
 webapps/docs/WEB-INF/web.xml   |   8 +-
 webapps/docs/changelog.xml |  11 +
 webapps/examples/WEB-INF/web.xml   |   8 +-
 webapps/host-manager/WEB-INF/web.xml   |   8 +-
 webapps/manager/WEB-INF/web.xml|   8 +-
 30 files changed, 598 insertions(+), 135 deletions(-)

diff --git a/LICENSE b/LICENSE
index 5065e55..218e7fd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,7 +210,14 @@ and license terms. Your use of these subcomponents is 
subject to the terms and
 conditions of the following licenses.
 
 
-For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component:
+For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component and the
+following Jakarta EE Schemas:
+- jakartaee_9.xsd
+- jakarta_web-services_2_0.xsd
+- jakarta_web-services_client_2_0.xsd
+- jsp_3_0.xsd
+- web-app_5_0.xsd
+- web-commonn_5_0.xsd
 
 Eclipse Public License - v 2.0
 
@@ -475,8 +482,8 @@ No third-party beneficiary rights are created under this 
Agreement.
 
 Exhibit A - Form of Secondary Licenses Notice
 
-"This Source Code may also be made available under the following 
-Secondary Licenses when the conditions for such availability set forth 
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
 in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
 version(s), and exceptions or additional permissions here}."
 
diff --git a/conf/web.xml b/conf/web.xml
index 2d08297..a0f604a 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
+https://jakarta.ee/xml/ns/jakartaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd;
+  version="5.0">
 
   
   
diff --git a/java/org/apache/tomcat/util/descriptor/DigesterFactory.java 
b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
index d920a44..9413de5 100644
--- a/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
+++ b/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
@@ -125,6 +125,15 @@ public class DigesterFactory {
 addSelf(systemIds, "web-common_4_0.xsd");
 addSelf(systemIds, "javaee_8.xsd");
 
+// from JakartaEE 9
+add(systemIds, XmlIdentifiers.WEB_50_XSD, 
locationFor("web-app_5_0.xsd"));
+add(systemIds, XmlIdentifiers.WEB_FRAGMENT_50_XSD, 
locationFor("web-fragment_5_0.xsd"));
+addSelf(systemIds, "web-common_5_0.xsd");
+addSelf(systemIds, "jakartaee_9.xsd");
+

Re: [tomcat] branch master updated: Update BND

2020-06-03 Thread Martin Grigorov

On Tue, Jun 2, 2020 at 5:12 PM  wrote:

> 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.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
>  new a0ad185  Update BND
> a0ad185 is described below
>
> commit a0ad1855c276a3ad145f1cbe0ce4ab4bbb7ad6ab
> Author: Mark Thomas 
> AuthorDate: Tue Jun 2 15:12:03 2020 +0100
>
> Update BND
> ---
>  build.properties.default   | 9 +
>  webapps/docs/changelog.xml | 3 +++
>  2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/build.properties.default b/build.properties.default
> index 85bb862..12af31c 100644
> --- a/build.properties.default
> +++ b/build.properties.default
> @@ -288,16 +288,17 @@
> saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-
>
>  # - bnd & bndlib, version 4.0.0 or later  -
>  # - provides OSGI metadata for JARs   -
> -bnd.version=5.0.1
> +bnd.version=5.1.0
>
> -# checksums for biz.aQute.bnd-5.0.1.jar, biz.aQute.bndlib-5.0.1.jar
> +# checksums for biz.aQute.bnd-5.1.0.jar
>  bnd.checksum.enabled=true
>  bnd.checksum.algorithm=MD5|SHA-1
>
> -bnd.checksum.value=42cb2f3bbb5556f0182131c6543f1579|67d8bb4f274e8ecfd8ebfcdeed3b328f7078b13b
>
> +bnd.checksum.value=477684fd83707666cc84a766b147ed0c|9069bc1afad9201e3dc2efe62c0d5193777d16ae
>
> +# checksums for biz.aQute.bndlib-5.1.0.jar
>  bndlib.checksum.enabled=true
>  bndlib.checksum.algorithm=MD5|SHA-1
>
> -bndlib.checksum.value=9d29031f80e3b94e3578fea75b45c8e6|aa13aef49a74fe0bd8bbcb016df124bab5d4064e
>
> +bndlib.checksum.value=59dfe87f09e3f03be891327a91430182|30e119e5b3ae63dbb86532490855707b009e1b2e
>
>  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 fe75def..67c061d 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -141,6 +141,9 @@
>  Resolver Ant Tasks to upload artifacts to the ASF Maven
> repository (and
>  from there to Maven Central). (markt)
>
> +  
> +Update dependency on bnd to 5.1.0. (markt)
> +  
>

I've just tested building Tomcat with JDK 15 b24 on x86_64 and aarch64 and
the build + test suite passed successfully!
Great!

Martin


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

[tomcat] branch master updated: Update a missed version number

2020-06-02 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 5520347  Update a missed version number
5520347 is described below

commit 55203470a3632c9386fe62e61ad6dae8e660cfd2
Author: Mark Thomas 
AuthorDate: Tue Jun 2 15:30:21 2020 +0100

Update a missed version number
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 4236393..8682b40 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 
   


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

[tomcat] branch master updated: Update BND

2020-06-02 Thread 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.git


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

commit a0ad1855c276a3ad145f1cbe0ce4ab4bbb7ad6ab
Author: Mark Thomas 
AuthorDate: Tue Jun 2 15:12:03 2020 +0100

Update BND
---
 build.properties.default   | 9 +
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 85bb862..12af31c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -288,16 +288,17 @@ 
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-
 
 # - bnd & bndlib, version 4.0.0 or later  -
 # - provides OSGI metadata for JARs   -
-bnd.version=5.0.1
+bnd.version=5.1.0
 
-# checksums for biz.aQute.bnd-5.0.1.jar, biz.aQute.bndlib-5.0.1.jar
+# checksums for biz.aQute.bnd-5.1.0.jar
 bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=42cb2f3bbb5556f0182131c6543f1579|67d8bb4f274e8ecfd8ebfcdeed3b328f7078b13b
+bnd.checksum.value=477684fd83707666cc84a766b147ed0c|9069bc1afad9201e3dc2efe62c0d5193777d16ae
 
+# checksums for biz.aQute.bndlib-5.1.0.jar
 bndlib.checksum.enabled=true
 bndlib.checksum.algorithm=MD5|SHA-1
-bndlib.checksum.value=9d29031f80e3b94e3578fea75b45c8e6|aa13aef49a74fe0bd8bbcb016df124bab5d4064e
+bndlib.checksum.value=59dfe87f09e3f03be891327a91430182|30e119e5b3ae63dbb86532490855707b009e1b2e
 
 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 fe75def..67c061d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,9 @@
 Resolver Ant Tasks to upload artifacts to the ASF Maven repository (and
 from there to Maven Central). (markt)
   
+  
+Update dependency on bnd to 5.1.0. (markt)
+  
 
   
 


-
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 bnd 5.0.1

2020-05-04 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 7b906a8  Update to bnd 5.0.1
7b906a8 is described below

commit 7b906a87768cabff60eee67572c82165625b4207
Author: Mark Thomas 
AuthorDate: Mon May 4 21:51:10 2020 +0100

Update to bnd 5.0.1

Note: This won't fix the build issue with Java 15 EA but it gets us on
the latest version
---
 build.properties.default   | 8 
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 928ba87..d550071 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -288,16 +288,16 @@ 
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-
 
 # - bnd & bndlib, version 4.0.0 or later  -
 # - provides OSGI metadata for JARs   -
-bnd.version=4.2.0
+bnd.version=5.0.1
 
-# checksums for biz.aQute.bnd-4.2.0.jar, biz.aQute.bndlib-4.2.0.jar
+# checksums for biz.aQute.bnd-5.0.1.jar, biz.aQute.bndlib-5.0.1.jar
 bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=ca26a671ea67bf75d83b1588bdd68923|d4bc96b2619f95e596bbf3f725f3b077e96c5d43
+bnd.checksum.value=42cb2f3bbb5556f0182131c6543f1579|67d8bb4f274e8ecfd8ebfcdeed3b328f7078b13b
 
 bndlib.checksum.enabled=true
 bndlib.checksum.algorithm=MD5|SHA-1
-bndlib.checksum.value=7519e890783ade99bb74608d0efbf8c4|c4fa30ac11cc0bf27b1f706ac8ebae8cec358e77
+bndlib.checksum.value=9d29031f80e3b94e3578fea75b45c8e6|aa13aef49a74fe0bd8bbcb016df124bab5d4064e
 
 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 887d93b..ac0f7e0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -243,6 +243,9 @@
 Improve the coverage and quality of the Korean translations provided
 with Apache Tomcat. (woonsan)
   
+  
+Update dependency on bnd to 5.0.1. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Update changelog

2020-05-04 Thread 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.git


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

commit eab7fdedb243fa5e9790f52e84f0a5e02e7ae814
Author: Mark Thomas 
AuthorDate: Mon May 4 15:55:31 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6f1aebb..02d40b6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -230,6 +230,10 @@
 Refactor to use enhanced for loops where possible. Pull request by Lars
 Grefer. (markt)
   
+  
+Improve IDE support for IntelliJ IDEA. Patch provided by Lars Grefer.
+(markt)
+  
 
   
 


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

[tomcat] branch master updated: Update changelog for PR #270

2020-04-22 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 33045bd  Update changelog for PR #270
33045bd is described below

commit 33045bd814d2c20e4f85e6454afe8717471ba26d
Author: Mark Thomas 
AuthorDate: Wed Apr 22 18:24:06 2020 +0100

Update changelog for PR #270
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f589d30..b5c0af0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,10 @@
 Refactor loops with a condition to exit as soon as the condition is 
met.
 Pull request provided by Lars Grefer. (markt)
   
+  
+Refactor bulk addition to collections to use addAll()
+rather than a loop. Pull request provided by Lars Grefer. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Update changelog for PR #272

2020-04-22 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new f7faac9  Update changelog for PR #272
f7faac9 is described below

commit f7faac9334b1b41fd45dc0a2344f29ddba4d0299
Author: Mark Thomas 
AuthorDate: Wed Apr 22 17:31:56 2020 +0100

Update changelog for PR #272
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 36c18cb..f589d30 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -142,6 +142,10 @@
 Refactor to use empty arrays with Collections.toArray().
 Pull request provided by Lars Grefer. (markt)
   
+  
+Refactor loops with a condition to exit as soon as the condition is 
met.
+Pull request provided by Lars Grefer. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Update change log for PR #269

2020-04-22 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new d43f2df  Update change log for PR #269
d43f2df is described below

commit d43f2df565ef90dcf7a3b4139d894a2127e50ab6
Author: Mark Thomas 
AuthorDate: Wed Apr 22 12:13:46 2020 +0100

Update change log for PR #269
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 882d5a7..2cefbc6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,6 +134,10 @@
 Add missing entries to test class path in sample NetBeans configuration
 files. Patch provided by Brian Burch. (markt)
   
+  
+Refactor to use parameterized Collection constructors 
where
+possible. Pull request provided by Lars Grefer. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Update JUnit to 4.13

2020-04-17 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new d739ceb  Update JUnit to 4.13
d739ceb is described below

commit d739ceb4dd88f743313aad95e4b4e88b4186f2f3
Author: Mark Thomas 
AuthorDate: Fri Apr 17 15:36:18 2020 +0100

Update JUnit to 4.13
---
 build.properties.default| 4 ++--
 modules/jdbc-pool/build.properties.default  | 2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 webapps/docs/changelog.xml  | 7 +++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 2b8bf3b..d73c8c6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -204,10 +204,10 @@ 
commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/co
 
commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
 
 # - JUnit Unit Test Suite, version 4.11 or later -
-junit.version=4.12
+junit.version=4.13
 junit.checksum.enabled=true
 junit.checksum.algorithm=MD5|SHA-1
-junit.checksum.value=5b38c40c97fbd0adee29f91e60405584|2973d150c0dc1fefe998f834810d68f278ea58ec
+junit.checksum.value=5da6445d7b80aba2623e73d4561dcfde|e49ccba652b735c93bd6e6f59760d8254cf597dd
 junit.home=${base.path}/junit-${junit.version}
 junit.jar=${junit.home}/junit-${junit.version}.jar
 
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/modules/jdbc-pool/build.properties.default 
b/modules/jdbc-pool/build.properties.default
index 4ae6c3b..c99ae56 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -65,7 +65,7 @@ testdb.validationQuery=SELECT 1
 #testdb.validationQuery=VALUES 1
 
 # JUnit Unit Test Suite
-junit.version=4.11
+junit.version=4.13
 junit.home=${base.path}/junit-${junit.version}
 junit.jar=${junit.home}/junit-${junit.version}.jar
 
junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 219c4fd..6897798 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 1648953..8e71143 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.15/junit-4.15.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
 1.7
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2155942..930a1bd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,6 +85,13 @@
   
 
   
+  
+
+  
+Update JUnit to version 4.13. (markt)
+  
+
+  
 
 
   


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

[tomcat] branch master updated: Update the security how-to to reflect the reduction in system properties

2020-04-01 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 13e4ed3  Update the security how-to to reflect the reduction in system 
properties
13e4ed3 is described below

commit 13e4ed380dec4a1b276fe23e8c1a7e80e0a271ec
Author: Mark Thomas 
AuthorDate: Wed Apr 1 11:53:28 2020 +0100

Update the security how-to to reflect the reduction in system properties
---
 webapps/docs/security-howto.xml | 35 +--
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml
index fbdb9d7..0eddda6 100644
--- a/webapps/docs/security-howto.xml
+++ b/webapps/docs/security-howto.xml
@@ -261,6 +261,11 @@
   address a connector listens on for connections. By default, a connector
   listens on all configured IP addresses.
 
+  The allowBackslash attribute allows non-standard
+  parsing of the request URI. Setting this attribute to a non-default value
+  when behind a reverse proxy may enable an attacker to bypass any security
+  constraints enforced by the proxy.
+
   The allowTrace attribute may be used to enable TRACE
   requests which can be useful for debugging. Due to the way some browsers
   handle the response from a TRACE request (which exposes the browser to an
@@ -271,6 +276,18 @@
   the default value, and this reduces the chances of a bug in an
   application exposing data from one request to another.
 
+  The encodedSolidusHandling attribute allows
+  non-standard parsing of the request URI. Setting this attribute to a
+  non-default value when behind a reverse proxy may enable an attacker to
+  bypass any security constraints enforced by the proxy.
+
+  The enforceEncodingInGetWriter attribute has security
+  implications if set to false. Many user agents, in breach of
+  RFC 7230, try to guess the character encoding of text media types when 
the
+  specification-mandated default of ISO-8859-1 should be used. Some 
browsers
+  will interpret as UTF-7 a response containing characters that are safe 
for
+  ISO-8859-1 but trigger an XSS vulnerability if interpreted as UTF-7.
+
   The maxPostSize attribute controls the maximum size
   of a POST request that will be parsed for parameters. The parameters are
   cached for the duration of the request so this is limited to 2MB by
@@ -465,24 +482,6 @@
 
   
 
-  
-The 
-org.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH and
-org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH
-system properties allow non-standard parsing of the request URI. Using
-these options when behind a reverse proxy may enable an attacker to bypass
-any security constraints enforced by the proxy.
-
-The 
-org.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER
- system property has security implications if disabled. Many user
-agents, in breach of RFC2616, try to guess the character encoding of text
-media types when the specification-mandated default of ISO-8859-1 should be
-used. Some browsers will interpret as UTF-7 a response containing 
characters
-that are safe for ISO-8859-1 but trigger an XSS vulnerability if 
interpreted
-as UTF-7.
-  
-
   
 This applies to the default conf/web.xml file, the
 /WEB-INF/tomcat-web.xml and the /WEB-INF/web.xml


-
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 CXF 3.3.6 and OWB 2.0.16

2020-03-31 Thread 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 5980541  Update to CXF 3.3.6 and OWB 2.0.16
5980541 is described below

commit 5980541cc680e815f17008853b175ed0cba45f30
Author: remm 
AuthorDate: Tue Mar 31 11:56:00 2020 +0200

Update to CXF 3.3.6 and OWB 2.0.16
---
 modules/cxf/pom.xml| 2 +-
 modules/owb/pom.xml| 2 +-
 webapps/docs/changelog.xml | 6 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index a8d54c5..59a2949 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,7 +29,7 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.3.5
+3.3.6
 jar
 
 
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index cd8033b..1a58c67 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,7 +29,7 @@
 Apache Tomcat CDI 2 support
 Apache Tomcat CDI 2 support using Apache 
OpenWebBeans
 
-2.0.15
+2.0.16
 jar
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d249193..4979bcc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -187,6 +187,12 @@
 be configured via the UMASK environment variable as it is
 when using catalina.sh. (markt)
   
+  
+Update the OWB module to Apache OpenWebBeans 2.0.16. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.3.6. (remm)
+  
 
   
 


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

[tomcat] branch master updated: Update docs as STRICT_SERVLET_COMPLIANCE no longer impacts URIEncoding

2020-03-30 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new c240e49  Update docs as STRICT_SERVLET_COMPLIANCE no longer impacts 
URIEncoding
c240e49 is described below

commit c240e49c09fd239cdba1217c3ae353dcf1964cba
Author: Mark Thomas 
AuthorDate: Mon Mar 30 22:00:56 2020 +0100

Update docs as STRICT_SERVLET_COMPLIANCE no longer impacts URIEncoding
---
 webapps/docs/changelog.xml  | 10 ++
 webapps/docs/config/ajp.xml |  5 +
 webapps/docs/config/http.xml|  5 +
 webapps/docs/config/systemprops.xml |  3 ---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 59ed7b4..d249193 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -161,6 +161,16 @@
   
 
   
+  
+
+  
+Correct documentation web application to remove references to the
+org.apache.catalina.STRICT_SERVLET_COMPLIANCE system
+property changing the default for the URIEncoding 
attribute
+of the Connector. (markt)
+  
+
+  
   
 
   
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index f1405c5..fa8fc0f 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -245,10 +245,7 @@
 
 
   This specifies the character encoding used to decode the URI bytes,
-  after %xx decoding the URL. If not specified, UTF-8 will be used unless
-  the org.apache.catalina.STRICT_SERVLET_COMPLIANCE
-  system property is set to 
true
-  in which case ISO-8859-1 will be used.
+  after %xx decoding the URL. The default value is UTF-8.
 
 
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index d58c8ab..d71a5d1 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -264,10 +264,7 @@
 
 
   This specifies the character encoding used to decode the URI bytes,
-  after %xx decoding the URL. If not specified, UTF-8 will be used unless
-  the org.apache.catalina.STRICT_SERVLET_COMPLIANCE
-  system property is set to 
true
-  in which case ISO-8859-1 will be used.
+  after %xx decoding the URL. The default value is UTF-8.
 
 
 
diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index a7cfac8..0a216b6 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -285,9 +285,6 @@
   to true instead of false for:
   
   
org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING
-  The URIEncoding attribute of any
-  HTTP connector or
-  AJP connector element.
   The alwaysAccessSession attribute of any
   Context element.
   The contextGetResourceRequiresSlash attribute of any


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

[tomcat] branch master updated: Update Maven dependency for ECJ

2020-03-28 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 3e773fb  Update Maven dependency for ECJ
3e773fb is described below

commit 3e773fb9104dab51d36aa488dd223d20a38239c7
Author: Mark Thomas 
AuthorDate: Sat Mar 28 14:54:18 2020 +

Update Maven dependency for ECJ
---
 res/maven/tomcat-jasper.pom | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index d6bf9579..991e48d 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
 
   org.eclipse.jdt
   ecj
-  3.18.0
+  3.21.0
 
 
   org.apache.tomcat


-
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 the Eclipse JDT compiler 4.15

2020-03-28 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 299768b  Update to the Eclipse JDT compiler 4.15
299768b is described below

commit 299768bddd8fe4b4ad935296267a0e974225afc2
Author: Mark Thomas 
AuthorDate: Sat Mar 28 14:48:51 2020 +

Update to the Eclipse JDT compiler 4.15
---
 build.properties.default   | 10 +-
 webapps/docs/changelog.xml |  7 +++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f6651d2..33b1fbe 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -130,14 +130,14 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # See 
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
 #
 # Checksum is from "SHA512 Checksums for 4.13" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/
-# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/checksum/eclipse-4.13-SUMSSHA512
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/checksum/eclipse-4.15-SUMSSHA512
 #
-jdt.version=4.13
-jdt.release=R-4.13-201909161045/
+jdt.version=4.15
+jdt.release=R-4.15-202003050155/
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=d608e4b7fc9b061e327ad5c39112c032e310a48c57ddd01c9349f2be8f5ce4d3d0c3862b6b5cc105220a06a6dd62c477de654b9fbe6f4c8a3d3de816e5de19f7
+jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8c4b43c..eb6caab 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -143,6 +143,13 @@
   
 
   
+  
+
+  
+Update to the Eclipse JDT compiler 4.15. (markt)
+  
+
+  
   
 
   


-
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 M3

2020-03-16 Thread 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 8410142  Update to M3
8410142 is described below

commit 841014220b7883355cd1fe5f655284bf320802d8
Author: remm 
AuthorDate: Mon Mar 16 11:05:41 2020 +0100

Update to M3
---
 modules/owb/pom.xml  | 2 +-
 res/tomcat-maven/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 4f512c1..cd8033b 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -36,7 +36,7 @@
 1.0
 1.0
 1.0.1
-10.0.0-M1
+10.0.0-M3
 
 
 
diff --git a/res/tomcat-maven/pom.xml b/res/tomcat-maven/pom.xml
index a48c2f0..9b37614 100644
--- a/res/tomcat-maven/pom.xml
+++ b/res/tomcat-maven/pom.xml
@@ -29,7 +29,7 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-10.0.0-M1
+10.0.0-M3
 
 
 


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

[tomcat] branch master updated: Update release date

2020-03-16 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 986c51e  Update release date
986c51e is described below

commit 986c51eaeb1429059b9d5d122eb8af3514cc7185
Author: Mark Thomas 
AuthorDate: Mon Mar 16 09:09:04 2020 +

Update release date
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5212908..92114c6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -61,7 +61,7 @@
 
   
 
-
+
   
 
   


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

[tomcat] branch master updated: Update gpg signing task in Maven publishing build file

2020-03-05 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 9b7333d  Update gpg signing task in Maven publishing build file
9b7333d is described below

commit 9b7333d59736740fc4a85fa0dbe03a04561b401c
Author: Mark Thomas 
AuthorDate: Thu Mar 5 19:27:46 2020 +

Update gpg signing task in Maven publishing build file
---
 res/maven/mvn-pub.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 67d36ea..5a72d72 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -521,6 +521,8 @@
 
   
+  
+  
   
   
   


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

Re: [tomcat] branch master updated: Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)

2020-03-05 Thread Mark Thomas

On 04/03/2020 22:19, ma...@apache.org wrote:
> 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.git
> 
> 
> The following commit(s) were added to refs/heads/master by this push:
>  new d52f5d7  Update gpg call for gpg2 (so there is no pop-up prompt for 
> passphrase)
> d52f5d7 is described below
> 
> commit d52f5d7bcaf6e59b6cf124628ef9f60eb4aee64e
> Author: Mark Thomas 
> AuthorDate: Wed Mar 4 22:18:58 2020 +
> 
> Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)

While this worked when I tested it yesterday, the release build is now
hanging at the first signature. Debugging...

Mark

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

[tomcat] branch master updated: Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)

2020-03-04 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new d52f5d7  Update gpg call for gpg2 (so there is no pop-up prompt for 
passphrase)
d52f5d7 is described below

commit d52f5d7bcaf6e59b6cf124628ef9f60eb4aee64e
Author: Mark Thomas 
AuthorDate: Wed Mar 4 22:18:58 2020 +

Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)
---
 build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 434861b..1bd17d9 100644
--- a/build.xml
+++ b/build.xml
@@ -3412,9 +3412,8 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
 
-  
-  
-  
+  
+  
   
   
   


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

[tomcat] branch master updated: Update removal notice

2020-03-03 Thread 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 1ab5dec  Update removal notice
1ab5dec is described below

commit 1ab5decee4e77008e860bc7e701379f6a17ae7cd
Author: remm 
AuthorDate: Tue Mar 3 15:25:12 2020 +0100

Update removal notice

The refactoring to nanoTime will most likely not be backported to Tomcat
9, so move the notice version number forward.
---
 java/org/apache/coyote/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Request.java 
b/java/org/apache/coyote/Request.java
index 05ba75c..dc77bf0 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -571,7 +571,7 @@ public final class Request {
 /**
  *
  * @param startTime time
- * @deprecated This setter will be removed in Tomcat 10.
+ * @deprecated This setter will be removed in Tomcat 10.1.
  */
 @Deprecated
 public void setStartTime(long startTime) {


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

[tomcat] branch master updated: Update changelog

2020-03-03 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 5b2cd9c  Update changelog
5b2cd9c is described below

commit 5b2cd9ca17625f641072cdd77a05f9d05893cae8
Author: Mark Thomas 
AuthorDate: Tue Mar 3 08:28:19 2020 +

Update changelog
---
 webapps/docs/changelog.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b7a7fa3..66a1629 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,11 @@
 and allow the other channels using the connection to continue. Based on
 a suggestion from Alejandro Anadon. (markt)
   
+  
+Correct the semantics of getEnableSessionCreation and
+setEnableSessionCreation for OpenSSLEngine.
+Pull request provided by Alexander Scheel. (markt)
+  
 
   
   


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

Re: [tomcat] branch master updated: Update request start time using nanoTime

2020-03-01 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Martin,

On 2/28/20 04:44, Martin Grigorov wrote:
> Chris,
>
> On Fri, Feb 28, 2020 at 12:20 AM Christopher Schultz
>  >
wrote:
>
> Rémy,
>
> On 2/27/20 10:49, r...@apache.org  wrote:
>> 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 22ad695  Update request start time using nanoTime
>> 22ad695 is described below
>
>> commit 22ad69571c019f4d84ccc522298dddb4f8fa8d70 Author: remm
>> mailto:r...@apache.org>> AuthorDate: Thu Feb
>> 27
> 16:49:04 2020 +0100
>
>> Update request start time using nanoTime
>
>> get/setStartTime are still there, not sure about existing use.
>> Another patch round could deprecate them. Also change the access
>> log to be the start of the request (a small part of 63286). ---
>
>> [snip]
>
>> diff --git a/java/org/apache/coyote/AbstractProcessor.java
>> b/java/org/apache/coyote/AbstractProcessor.java index
>> 254950e..5af3710 100644 ---
>> a/java/org/apache/coyote/AbstractProcessor.java +++
>> b/java/org/apache/coyote/AbstractProcessor.java @@ -978,6 +978,7
>> @@ public abstract class AbstractProcessor extends
>> AbstractProcessorLight implement
>> setSocketWrapper(socketWrapper); // Setup the minimal request
>> information request.setStartTime(System.currentTimeMillis()); +
>> request.setStartTimeNanos(System.nanoTime()); // Setup the
>> minimal response information response.setStatus(400);
>> response.setError();
>
> Since we are talking about nanoseconds, here, we ARE, by
> definition, splitting hairs :)
>
> System.currentTimeMillis() and System.nanoTime() may disagree when
> you capture them like this, because [a super-small amount of] time
> elapses between the two calls.
>
> Should we instead do:
>
> long nanos = System.nanoTime(); request.setStartTimeNanos(nanos);
> request.setStartTime(nanos / 100l);
>
> Or maybe:
>
> long nanos = System.nanoTime(); request.setStartTimeNanos(nanos);
> request.setStartTime(TimeUnit.NANOSECONDS.toMillis(nanos));
>
>
>> Those are not the same. Request#startTime
>> (System.currentTimeMillis) is the milliseconds since Epoch, i.e.
>> a complete timestamp. System.nanoTime() is just a relative time
>> that could be used to measure duration between two calls but it
>> doesn't tell you when exactly a call has happened.

Duh. Thanks for the sanity check :)

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5cDmUACgkQHPApP6U8
pFinzQ/9H80fwJ6I/pN5Ikrb3e/SW21kSWkVOkAypYV6EX0NwfIaAhz9KFYJehwS
YMj9iodMkhpfpibRg7B3dXlDPfOjsLRRadc2KQS/5/nOyh+YMfkoXpqXz8gL0ltt
eFRuUElA691lcAa/3hTsO/Lvw+NCUad/syXkvRBwJUWInmdGMGIZNCpAu2SYfga0
Gz51317tmV83RRSkXLQCc0t1cDTEhzWlv3bo6foe9elT5phGvd80PUAFSMga9RZa
94ee9jbM7QWfk/L/MdSlwiTVNOe4UXjBsFbIvVs1Eqy/4KkBlKwrP3iG7boXlAgm
NIHRWEYs0fwDQxk8fSbxoO6nKsgkX+hsySBi43OZhAdDAtK+AKMYyOFOF9QuDVKI
sKiobgDy5KA+dCVCI0k/O1DF3JYL0opeKDsOPHryvwcWQgtNXRdYWIiVyp1wHw9z
9MFlEgD4l6ncugKWRL4YzB06KS2YQxVbx+4IxeHPNqBF8PhmwdagHHT2aqXZoz36
fx8ra2q1M5kP+1DNioZ/pgr3Y1aCaWBu6J+qEvCS/UbYGPOTSto3VqcB+edfIaRU
Lknc0fshkfR1vYqUg3T//GI0BSlP9eAhf1ThEM0d7usb7mow2+e9AUF3AEERMiXn
Zsl0r/i+ZOK8lhiJgvh8/GSEwP1nreCCPvHnpqsVsRXRjF+KZZg=
=fnBR
-END PGP SIGNATURE-

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

[tomcat] branch master updated: Update after kkolinko review of new PersistAuthentication attribute

2020-02-28 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 86b5fc8  Update after kkolinko review of new PersistAuthentication 
attribute
86b5fc8 is described below

commit 86b5fc8e892cc37a15b90eb8ae708962054d721c
Author: Mark Thomas 
AuthorDate: Fri Feb 28 19:28:53 2020 +

Update after kkolinko review of new PersistAuthentication attribute
---
 .../apache/catalina/session/StandardSession.java|  4 ++--
 webapps/docs/config/manager.xml | 21 ++---
 webapps/docs/security-howto.xml |  4 
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/catalina/session/StandardSession.java 
b/java/org/apache/catalina/session/StandardSession.java
index eeec5ce..951f9ee 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -1668,7 +1668,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
 // Gather authentication information (if configured)
 String sessionAuthType = null;
 Principal sessionPrincipal = null;
-if (isPersistAuthentication()) {
+if (getPersistAuthentication()) {
 sessionAuthType = getAuthType();
 sessionPrincipal = getPrincipal();
 if (!(sessionPrincipal instanceof Serializable)) {
@@ -1727,7 +1727,7 @@ public class StandardSession implements HttpSession, 
Session, Serializable {
  * @return {@code true}, if authentication information shall be persisted;
  * {@code false} otherwise
  */
-private boolean isPersistAuthentication() {
+private boolean getPersistAuthentication() {
 if (manager instanceof ManagerBase) {
 return ((ManagerBase) manager).getPersistAuthentication();
 }
diff --git a/webapps/docs/config/manager.xml b/webapps/docs/config/manager.xml
index 640e62d..8af3e20 100644
--- a/webapps/docs/config/manager.xml
+++ b/webapps/docs/config/manager.xml
@@ -139,23 +139,6 @@
 filter pattern in order to be restored.
   
 
-  
-Should authentication information be included when session state is
-preserved across application restarts? If true, the 
session's
-authentication is preserved so that the session remains authenticated
-after the application has been restarted. If not specified, the default
-value of false will be used.See
-Persistence Across Restarts
-for more information.
-
-Please note that the session's Principal class as well
-as its descendant classes are all subject to the
-sessionAttributeValueClassNameFilter. If such a filter
-is specified or a SecurityManager is enabled, the names of
-the Principal class and descendant classes must match that
-filter pattern in order to be restored.
-  
-
   
 Frequency of the session expiration, and related manager operations.
 Manager operations will be done once for the specified amount of
@@ -212,7 +195,7 @@
 must fully match the pattern. If not specified, the default value of
 null will be used unless a SecurityManager is
 enabled in which case the default will be
-
java\\.lang\\.(?:Boolean|Integer|Long|Number|String)|org\\.apache\\.catalina\\.realm\\.GenericPrincipal\\$SerializablePrincipal|\\[Ljava.lang.String;.
+
java\\.lang\\.(?:Boolean|Integer|Long|Number|String)|org\\.apache\\.catalina\\.realm\\.GenericPrincipal\\$SerializablePrincipal|\\[Ljava.lang.String;.
   
 
   
@@ -350,7 +333,7 @@
 must fully match the pattern. If not specified, the default value of
 null will be used unless a SecurityManager is
 enabled in which case the default will be
-
java\\.lang\\.(?:Boolean|Integer|Long|Number|String)|org\\.apache\\.catalina\\.realm\\.GenericPrincipal\\$SerializablePrincipal|\\[Ljava.lang.String;.
+
java\\.lang\\.(?:Boolean|Integer|Long|Number|String)|org\\.apache\\.catalina\\.realm\\.GenericPrincipal\\$SerializablePrincipal|\\[Ljava.lang.String;.
   
 
   
diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml
index a42eb17..fbdb9d7 100644
--- a/webapps/docs/security-howto.xml
+++ b/webapps/docs/security-howto.xml
@@ -447,6 +447,10 @@
 
   The length of the session ID may be changed with the
   sessionIdLength attribute.
+
+  The persistAuthentication controls whether the
+  authenticated Principal associated with the session (if any) is included
+  when the session is persisted during a restart or to a Store.
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

Re: [tomcat] branch master updated: Update request start time using nanoTime

2020-02-28 Thread Martin Grigorov

Chris,

On Fri, Feb 28, 2020 at 12:20 AM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Rémy,
>
> On 2/27/20 10:49, r...@apache.org wrote:
> > 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 22ad695  Update request start time using nanoTime 22ad695
> > is described below
> >
> > commit 22ad69571c019f4d84ccc522298dddb4f8fa8d70 Author: remm
> >  AuthorDate: Thu Feb 27 16:49:04 2020 +0100
> >
> > Update request start time using nanoTime
> >
> > get/setStartTime are still there, not sure about existing use.
> > Another patch round could deprecate them. Also change the access
> > log to be the start of the request (a small part of 63286). ---
> >
> > [snip]
> >
> > diff --git a/java/org/apache/coyote/AbstractProcessor.java
> > b/java/org/apache/coyote/AbstractProcessor.java index
> > 254950e..5af3710 100644 ---
> > a/java/org/apache/coyote/AbstractProcessor.java +++
> > b/java/org/apache/coyote/AbstractProcessor.java @@ -978,6 +978,7 @@
> > public abstract class AbstractProcessor extends
> > AbstractProcessorLight implement setSocketWrapper(socketWrapper);
> > // Setup the minimal request information
> > request.setStartTime(System.currentTimeMillis()); +
> > request.setStartTimeNanos(System.nanoTime()); // Setup the minimal
> > response information response.setStatus(400); response.setError();
>
> Since we are talking about nanoseconds, here, we ARE, by definition,
> splitting hairs :)
>
> System.currentTimeMillis() and System.nanoTime() may disagree when you
> capture them like this, because [a super-small amount of] time elapses
> between the two calls.
>
> Should we instead do:
>
> long nanos = System.nanoTime();
> request.setStartTimeNanos(nanos);
> request.setStartTime(nanos / 100l);
>
> Or maybe:
>
> long nanos = System.nanoTime();
> request.setStartTimeNanos(nanos);
> request.setStartTime(TimeUnit.NANOSECONDS.toMillis(nanos));
>
>
Those are not the same.
Request#startTime (System.currentTimeMillis) is the milliseconds since
Epoch, i.e. a complete timestamp.
System.nanoTime() is just a relative time that could be used to measure
duration between two calls but it doesn't tell you when exactly a call has
happened.


> ?
>
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5YQJgACgkQHPApP6U8
> pFhTeBAAnSpEZcvd99nyNM8rjYaCuXvij+yaKjOWPq0TFoH7mhJGkWGzTeVS0RoX
> ONB23CqbhXv2lI9aOcCjlghW7cwvRXCiLU4I6WVZ8fDj2yjPVvEpccNrJLozmuof
> DgfCTx/Uc21s0UMkj6maCdxLUfZdGiBNcp7zwURLwanWhzqRfVzna1VwcQNPiws0
> eSK4R0YxrzS6Gt6i00+2e9FyqIe2tUL/hrF5/d3Zj9U4P/b17QOeC3FZfgZjdWMY
> splxjEBFx+YmgsAV56qx9uePHjtRnnO30WZEz7X8H+7AwENk6kp5qcA38q7WUkrm
> HS3EWYQC8W5dEsu7WcBqj3ZqDSpmwwJaZlSDFXh+bqL9AqEBnLutbBsl+49p6mHP
> NvvIQ/Q0sCXOhH7y8juB310yDDkKhHsqRbY2cUzK+eHrdSibESqwDLBDR59F5se/
> GQKw4J3icMdqxq69vOxfbXQ6R0PxiL984xW/bcvyH7xZt+d166+BtzyUWHX3knxH
> zv+0XUjErwIVrmXXTFDyJYNtjQUGULVdAtGqqSu6mQ+lw0Kr/6i9gqAR4/TUL202
> zr8drtkAv87UDQvJpEshmoLtq1tXIwBywtKf9XnXSA6Bgbz5kkMf4lbPWbMJdLQP
> BhoyiVA3Xcn8WN4RLCVeEqZHd28/6uWjLjvQXFmRIS8at3tYSeE=
> =WcID
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [tomcat] branch master updated: Update request start time using nanoTime

2020-02-27 Thread Rémy Maucherat

On Thu, Feb 27, 2020 at 11:26 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Rémy,
>
> On 2/27/20 17:20, Christopher Schultz wrote:
> > Rémy,
> >
> > On 2/27/20 10:49, r...@apache.org wrote:
> >> 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 22ad695  Update request start time using nanoTime
> >> 22ad695 is described below
> >
> >> commit 22ad69571c019f4d84ccc522298dddb4f8fa8d70 Author: remm
> >>  AuthorDate: Thu Feb 27 16:49:04 2020 +0100
> >
> >> Update request start time using nanoTime
> >
> >> get/setStartTime are still there, not sure about existing use.
> >> Another patch round could deprecate them. Also change the access
> >> log to be the start of the request (a small part of 63286). ---
> >
> >> [snip]
> >
> >> diff --git a/java/org/apache/coyote/AbstractProcessor.java
> >> b/java/org/apache/coyote/AbstractProcessor.java index
> >> 254950e..5af3710 100644 ---
> >> a/java/org/apache/coyote/AbstractProcessor.java +++
> >> b/java/org/apache/coyote/AbstractProcessor.java @@ -978,6 +978,7
> >> @@ public abstract class AbstractProcessor extends
> >> AbstractProcessorLight implement
> >> setSocketWrapper(socketWrapper); // Setup the minimal request
> >> information request.setStartTime(System.currentTimeMillis()); +
> >> request.setStartTimeNanos(System.nanoTime()); // Setup the
> >> minimal response information response.setStatus(400);
> >> response.setError();
> >
> > Since we are talking about nanoseconds, here, we ARE, by
> > definition, splitting hairs :)
> >
> > System.currentTimeMillis() and System.nanoTime() may disagree when
> > you capture them like this, because [a super-small amount of] time
> > elapses between the two calls.
> >
> > Should we instead do:
> >
> > long nanos = System.nanoTime(); request.setStartTimeNanos(nanos);
> > request.setStartTime(nanos / 100l);
> >
> > Or maybe:
> >
> > long nanos = System.nanoTime(); request.setStartTimeNanos(nanos);
> > request.setStartTime(TimeUnit.NANOSECONDS.toMillis(nanos));
> >
> > ?
>
> Also, System.nanoTime apparently takes a lot longer than
> System.currentTimeMillis(), but it always moves forward in time, while
> System.currentTimeMillis can fall back for leap seconds, etc. and can
> behave in surprising ways :)
>

getStartTime isn't used anymore [in Tomcat itself] so it's not a big
problem. I'll try to think more about removing it, and maybe Mark will want
to redo this refactoring anyway.

Rémy


>
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5YQhgACgkQHPApP6U8
> pFgh4g/9GPUk5r+Lu8F2+JdhBs35v1oZwJE7D341sOcgycbVPLzoWBh2/EJvNSUS
> l+PmfkVSJNNUqMgjQU0UAtQBNEkvanTA+teGP1UyJZS1tL6dkrJAQslXbO0ReUYX
> sRzo9xHSrrBhc5CTYpfryHzEuf798zNBuQvyze84eyCT3ZQeaYm34JbQ6/QPh9XV
> GBFMWyQXK8tm7JdGrPpd9QRmTxvTyVdq327bUv4fcYnjv0OUS67illZQWCKMv1JK
> DwJpVDMzL/RtoaxGJWREuxC0L6541czgD6tEOV2dxUYSUR4OnTQAhPOr/4NvARH7
> JV3j3qzV3jiqDSwHePplAKk/i03nOTRq6wZW/D76Yg4Ut9C1p1wWWF6Dw2kTT724
> DNpcSKYHA2t4Mg09z/C7dr4gtXYQ4SbxFtvEseiHycKq5ViWpGUYs83DQjMnMwBW
> /Fw1JnZulMWxz5UkmHM+fSAsAF/njLAFBVY7cf8xhBoPok6coyOBCcsS46ymizde
> notzIXpiuWOAaqP8g1Bjzm3OYjjH2gOxKLXhfghpy7guG5NGfuL9E+KDF90KzL70
> dZsTepF0d/slGkDP/g5f9PSYwZhwsz7jAkaQbSAm68EjF1MsAQbnv+MxSBthOOP1
> y9J6g9SqCakWe8JyUrHTmtO39EMugBvW75OubbLP3c/JyIdDi94=
> =aLrh
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [tomcat] branch master updated: Update request start time using nanoTime

2020-02-27 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

Some interesting[1] reading:

https://steveloughran.blogspot.com/2015/09/time-on-multi-core-multi-sock
et-servers.html

- -chris

[1] For some definitions of "interesting"

On 2/27/20 17:26, Christopher Schultz wrote:
> Rémy,
>
> On 2/27/20 17:20, Christopher Schultz wrote:
>> Rémy,
>
>> On 2/27/20 10:49, r...@apache.org wrote:
>>> 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 22ad695  Update request start time using
>>> nanoTime 22ad695 is described below
>
>>> commit 22ad69571c019f4d84ccc522298dddb4f8fa8d70 Author: remm
>>>  AuthorDate: Thu Feb 27 16:49:04 2020 +0100
>
>>> Update request start time using nanoTime
>
>>> get/setStartTime are still there, not sure about existing use.
>>> Another patch round could deprecate them. Also change the
>>> access log to be the start of the request (a small part of
>>> 63286). ---
>
>>> [snip]
>
>>> diff --git a/java/org/apache/coyote/AbstractProcessor.java
>>> b/java/org/apache/coyote/AbstractProcessor.java index
>>> 254950e..5af3710 100644 ---
>>> a/java/org/apache/coyote/AbstractProcessor.java +++
>>> b/java/org/apache/coyote/AbstractProcessor.java @@ -978,6
>>> +978,7 @@ public abstract class AbstractProcessor extends
>>> AbstractProcessorLight implement
>>> setSocketWrapper(socketWrapper); // Setup the minimal request
>>> information request.setStartTime(System.currentTimeMillis());
>>> + request.setStartTimeNanos(System.nanoTime()); // Setup the
>>> minimal response information response.setStatus(400);
>>> response.setError();
>
>> Since we are talking about nanoseconds, here, we ARE, by
>> definition, splitting hairs :)
>
>> System.currentTimeMillis() and System.nanoTime() may disagree
>> when you capture them like this, because [a super-small amount
>> of] time elapses between the two calls.
>
>> Should we instead do:
>
>> long nanos = System.nanoTime();
>> request.setStartTimeNanos(nanos); request.setStartTime(nanos /
>> 100l);
>
>> Or maybe:
>
>> long nanos = System.nanoTime();
>> request.setStartTimeNanos(nanos);
>> request.setStartTime(TimeUnit.NANOSECONDS.toMillis(nanos));
>
>> ?
>
> Also, System.nanoTime apparently takes a lot longer than
> System.currentTimeMillis(), but it always moves forward in time,
> while System.currentTimeMillis can fall back for leap seconds, etc.
> and can behave in surprising ways :)
>
> -chris
>
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5YQz0ACgkQHPApP6U8
pFhE6A//aCZRXyBVu5VjqeM53Sa3luTca3+Q3o70cRbefrqSpgGHVGCaCEBTFX8L
fIk1yrXE8TB9sA0C2d/SEdPK/Db0crirNTR6yQr49w5XU7a841u/wrI+Vqb3/5je
+Jhg5yRyrSZD7LNyRmXk1xudjWehCGmixMQzZuRWTN1fJZsVKe1PUHvQ4omWkQ6u
8IiPfPyY3UNPw0bCofw291i/KSP23/Hdad+QGG/7HRdJR7XZqtIG7x9x9W27m12F
4kKjNfPvtDr/TAEjVvFw35L5G5hw4oAtk1pPbXabQItieU0iY78pIFJVE/PH4fQ9
Cjn62fPXtBXy/XI1WTYDTUkkLiu69vXzN9Za1kLXvH6rJuzo+0kkbEOudknwEbHz
tTy5mGcdURv+qBloaH4PaednVeFFbVuU/vsZghh1ytNW379FvXtT3upuM+eJNPM1
US2v8TKSp3sK9kirgOWdwzAMkqXsQ7vQDGAiSZ+EMvMzn4CtOTWfaYioDvowzEIT
thc3j/XmvhQtygQAgO7fG4cRVUEnKlJ9AhWmxzl6isNSA7zBMMsYBSivRKFeyOha
61jeUhbZzituUyGjzTxFJPPlsXY4+8XnuMSRGo68ZPlkAU8ZWtrrKO4iGZ51gY3L
AN4ppdLGy6DeJM20nK21Xpjx31QW5qhcNGolL0llihWZW31hYLQ=
=yi5w
-END PGP SIGNATURE-

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

Re: [tomcat] branch master updated: Update request start time using nanoTime

2020-02-27 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Rémy,

On 2/27/20 17:20, Christopher Schultz wrote:
> Rémy,
>
> On 2/27/20 10:49, r...@apache.org wrote:
>> 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 22ad695  Update request start time using nanoTime
>> 22ad695 is described below
>
>> commit 22ad69571c019f4d84ccc522298dddb4f8fa8d70 Author: remm
>>  AuthorDate: Thu Feb 27 16:49:04 2020 +0100
>
>> Update request start time using nanoTime
>
>> get/setStartTime are still there, not sure about existing use.
>> Another patch round could deprecate them. Also change the access
>> log to be the start of the request (a small part of 63286). ---
>
>> [snip]
>
>> diff --git a/java/org/apache/coyote/AbstractProcessor.java
>> b/java/org/apache/coyote/AbstractProcessor.java index
>> 254950e..5af3710 100644 ---
>> a/java/org/apache/coyote/AbstractProcessor.java +++
>> b/java/org/apache/coyote/AbstractProcessor.java @@ -978,6 +978,7
>> @@ public abstract class AbstractProcessor extends
>> AbstractProcessorLight implement
>> setSocketWrapper(socketWrapper); // Setup the minimal request
>> information request.setStartTime(System.currentTimeMillis()); +
>> request.setStartTimeNanos(System.nanoTime()); // Setup the
>> minimal response information response.setStatus(400);
>> response.setError();
>
> Since we are talking about nanoseconds, here, we ARE, by
> definition, splitting hairs :)
>
> System.currentTimeMillis() and System.nanoTime() may disagree when
> you capture them like this, because [a super-small amount of] time
> elapses between the two calls.
>
> Should we instead do:
>
> long nanos = System.nanoTime(); request.setStartTimeNanos(nanos);
> request.setStartTime(nanos / 100l);
>
> Or maybe:
>
> long nanos = System.nanoTime(); request.setStartTimeNanos(nanos);
> request.setStartTime(TimeUnit.NANOSECONDS.toMillis(nanos));
>
> ?

Also, System.nanoTime apparently takes a lot longer than
System.currentTimeMillis(), but it always moves forward in time, while
System.currentTimeMillis can fall back for leap seconds, etc. and can
behave in surprising ways :)

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5YQhgACgkQHPApP6U8
pFgh4g/9GPUk5r+Lu8F2+JdhBs35v1oZwJE7D341sOcgycbVPLzoWBh2/EJvNSUS
l+PmfkVSJNNUqMgjQU0UAtQBNEkvanTA+teGP1UyJZS1tL6dkrJAQslXbO0ReUYX
sRzo9xHSrrBhc5CTYpfryHzEuf798zNBuQvyze84eyCT3ZQeaYm34JbQ6/QPh9XV
GBFMWyQXK8tm7JdGrPpd9QRmTxvTyVdq327bUv4fcYnjv0OUS67illZQWCKMv1JK
DwJpVDMzL/RtoaxGJWREuxC0L6541czgD6tEOV2dxUYSUR4OnTQAhPOr/4NvARH7
JV3j3qzV3jiqDSwHePplAKk/i03nOTRq6wZW/D76Yg4Ut9C1p1wWWF6Dw2kTT724
DNpcSKYHA2t4Mg09z/C7dr4gtXYQ4SbxFtvEseiHycKq5ViWpGUYs83DQjMnMwBW
/Fw1JnZulMWxz5UkmHM+fSAsAF/njLAFBVY7cf8xhBoPok6coyOBCcsS46ymizde
notzIXpiuWOAaqP8g1Bjzm3OYjjH2gOxKLXhfghpy7guG5NGfuL9E+KDF90KzL70
dZsTepF0d/slGkDP/g5f9PSYwZhwsz7jAkaQbSAm68EjF1MsAQbnv+MxSBthOOP1
y9J6g9SqCakWe8JyUrHTmtO39EMugBvW75OubbLP3c/JyIdDi94=
=aLrh
-END PGP SIGNATURE-

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

Re: [tomcat] branch master updated: Update request start time using nanoTime

2020-02-27 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Rémy,

On 2/27/20 10:49, r...@apache.org wrote:
> 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 22ad695  Update request start time using nanoTime 22ad695
> is described below
>
> commit 22ad69571c019f4d84ccc522298dddb4f8fa8d70 Author: remm
>  AuthorDate: Thu Feb 27 16:49:04 2020 +0100
>
> Update request start time using nanoTime
>
> get/setStartTime are still there, not sure about existing use.
> Another patch round could deprecate them. Also change the access
> log to be the start of the request (a small part of 63286). ---
>
> [snip]
>
> diff --git a/java/org/apache/coyote/AbstractProcessor.java
> b/java/org/apache/coyote/AbstractProcessor.java index
> 254950e..5af3710 100644 ---
> a/java/org/apache/coyote/AbstractProcessor.java +++
> b/java/org/apache/coyote/AbstractProcessor.java @@ -978,6 +978,7 @@
> public abstract class AbstractProcessor extends
> AbstractProcessorLight implement setSocketWrapper(socketWrapper);
> // Setup the minimal request information
> request.setStartTime(System.currentTimeMillis()); +
> request.setStartTimeNanos(System.nanoTime()); // Setup the minimal
> response information response.setStatus(400); response.setError();

Since we are talking about nanoseconds, here, we ARE, by definition,
splitting hairs :)

System.currentTimeMillis() and System.nanoTime() may disagree when you
capture them like this, because [a super-small amount of] time elapses
between the two calls.

Should we instead do:

long nanos = System.nanoTime();
request.setStartTimeNanos(nanos);
request.setStartTime(nanos / 100l);

Or maybe:

long nanos = System.nanoTime();
request.setStartTimeNanos(nanos);
request.setStartTime(TimeUnit.NANOSECONDS.toMillis(nanos));

?

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5YQJgACgkQHPApP6U8
pFhTeBAAnSpEZcvd99nyNM8rjYaCuXvij+yaKjOWPq0TFoH7mhJGkWGzTeVS0RoX
ONB23CqbhXv2lI9aOcCjlghW7cwvRXCiLU4I6WVZ8fDj2yjPVvEpccNrJLozmuof
DgfCTx/Uc21s0UMkj6maCdxLUfZdGiBNcp7zwURLwanWhzqRfVzna1VwcQNPiws0
eSK4R0YxrzS6Gt6i00+2e9FyqIe2tUL/hrF5/d3Zj9U4P/b17QOeC3FZfgZjdWMY
splxjEBFx+YmgsAV56qx9uePHjtRnnO30WZEz7X8H+7AwENk6kp5qcA38q7WUkrm
HS3EWYQC8W5dEsu7WcBqj3ZqDSpmwwJaZlSDFXh+bqL9AqEBnLutbBsl+49p6mHP
NvvIQ/Q0sCXOhH7y8juB310yDDkKhHsqRbY2cUzK+eHrdSibESqwDLBDR59F5se/
GQKw4J3icMdqxq69vOxfbXQ6R0PxiL984xW/bcvyH7xZt+d166+BtzyUWHX3knxH
zv+0XUjErwIVrmXXTFDyJYNtjQUGULVdAtGqqSu6mQ+lw0Kr/6i9gqAR4/TUL202
zr8drtkAv87UDQvJpEshmoLtq1tXIwBywtKf9XnXSA6Bgbz5kkMf4lbPWbMJdLQP
BhoyiVA3Xcn8WN4RLCVeEqZHd28/6uWjLjvQXFmRIS8at3tYSeE=
=WcID
-END PGP SIGNATURE-

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

[tomcat] branch master updated: Update request start time using nanoTime

2020-02-27 Thread 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 22ad695  Update request start time using nanoTime
22ad695 is described below

commit 22ad69571c019f4d84ccc522298dddb4f8fa8d70
Author: remm 
AuthorDate: Thu Feb 27 16:49:04 2020 +0100

Update request start time using nanoTime

get/setStartTime are still there, not sure about existing use. Another
patch round could deprecate them.
Also change the access log to be the start of the request (a small part
of 63286).
---
 TOMCAT-NEXT.txt|  6 ++---
 .../apache/catalina/connector/CoyoteAdapter.java   |  7 +++---
 .../catalina/valves/AbstractAccessLogValve.java| 16 +
 java/org/apache/coyote/AbstractProcessor.java  |  1 +
 java/org/apache/coyote/Request.java| 10 
 java/org/apache/coyote/RequestInfo.java| 28 --
 java/org/apache/coyote/Response.java   |  2 +-
 java/org/apache/coyote/ajp/AjpProcessor.java   |  1 +
 .../apache/coyote/http11/Http11InputBuffer.java|  3 +++
 java/org/apache/coyote/http2/Stream.java   |  3 +++
 webapps/docs/changelog.xml |  4 
 11 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index ab47a46..34e3adf 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -41,11 +41,9 @@ New items for 10.0.x onwards:
  4. RFC 3986 states (section 2.2) that a %nn encoded delimiter is NOT 
equivalent
 to the decoded form. Provide an option not to decode delimiters in %nn 
form.
 
- 5. BZ 56966. Refactor internal request timing to use System.nanoTime()
+ 5. BZ 63286. Make behaviour of %D and %T consistent with httpd.
 
- 6. BZ 63286. Make behaviour of %D and %T consistent with httpd.
-
- 7. Refactor DefaultServlet to use Ranges in parseRanges().
+ 6. Refactor DefaultServlet to use Ranges in parseRanges().
 
 Deferred until 10.1.x:
 
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 1a1430b..18b8025 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.EnumSet;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import jakarta.servlet.ReadListener;
@@ -273,8 +274,8 @@ public class CoyoteAdapter implements Adapter {
 // Access logging
 if (!success || !request.isAsync()) {
 long time = 0;
-if (req.getStartTime() != -1) {
-time = System.currentTimeMillis() - req.getStartTime();
+if (req.getStartTimeNanos() != -1) {
+time = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - 
req.getStartTimeNanos());
 }
 Context context = request.getContext();
 if (context != null) {
@@ -402,7 +403,7 @@ public class CoyoteAdapter implements Adapter {
 // The other possibility is that an error occurred early in
 // processing and the request could not be mapped to a Context.
 // Log via the host or engine in that case.
-long time = System.currentTimeMillis() - req.getStartTime();
+long time = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - 
req.getStartTimeNanos());
 if (context != null) {
 context.logAccess(request, response, time, false);
 } else if (response.isError()) {
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 47685ea..5cc1f03 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import jakarta.servlet.RequestDispatcher;
@@ -699,14 +700,9 @@ public abstract class AbstractAccessLogValve extends 
ValveBase implements Access
 return;
 }
 
-/**
- * XXX This is a bit silly, but we want to have start and stop time and
- * duration consistent. It would be better to keep start and stop
- * simply in the request and/or response object and remove time
- * (duration) from the interface.
- */
-long start = request.getCoyoteRequest().getStartTime();
-Date date =

[tomcat] branch master updated: Update changelog

2020-02-26 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 8976a91  Update changelog
8976a91 is described below

commit 8976a91ca762fc733010ede38fe04e2ec2f48cbb
Author: Mark Thomas 
AuthorDate: Wed Feb 26 18:48:56 2020 +

Update changelog
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 60c9097..08e27ba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,10 @@
 Patch provided by ThStock. (schultz)
   
   
+64153: Ensure that the parent for the web application class
+loader is set consistently. 
+  
+  
 64166: Ensure that the names returned by
 HttpServletResponse.getHeaderNames() are unique. (markt)
   


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

[tomcat] branch master updated: Update CDI and CXF support

2020-02-25 Thread 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 8c60d0e  Update CDI and CXF support
8c60d0e is described below

commit 8c60d0e573c5745ec8100a7814216b9b92596cfc
Author: remm 
AuthorDate: Tue Feb 25 16:27:19 2020 +0100

Update CDI and CXF support

Document support in Tomcat 10 after testing it, the tool works out.
CDI shade JAR should be migrated to Jakarta by the tool. A MP webapp
should go through the tool as a whole.
---
 modules/cxf/pom.xml| 10 ++
 modules/owb/pom.xml|  6 +++---
 webapps/docs/cdi.xml   |  8 +++-
 webapps/docs/changelog.xml | 10 ++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 2015ff0..a8d54c5 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.3.4
+3.3.5
 jar
 
 
 1.0.1
 1.1.4
 1.0
-1.2.1
+1.2.3
 
 
 
@@ -96,7 +96,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.5.1
+3.8.1
 
 1.8
 1.8
@@ -105,7 +105,7 @@
 
 org.apache.maven.plugins
 maven-shade-plugin
-3.0.0
+3.2.1
 
 
 package
@@ -127,6 +127,8 @@
 
 
jakarta.annotation:jakarta.annotation-api

jakarta.el:*
+
javax.annotation:javax.annotation-api
+javax.el:*

javax.enterprise:cdi-api

javax.inject:*

javax.interceptor:*
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 087bc07..4f512c1 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.13
+2.0.15
 jar
 
 
 1.0
 1.0
 1.0.1
-9.0.30
+10.0.0-M1
 
 
 
@@ -86,7 +86,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.5.1
+3.8.1
 
 1.8
 1.8
diff --git a/webapps/docs/cdi.xml b/webapps/docs/cdi.xml
index e9cea2c..5c814c2 100644
--- a/webapps/docs/cdi.xml
+++ b/webapps/docs/cdi.xml
@@ -59,7 +59,8 @@ mvn clean && mvn package]]>
 The resulting JAR at
 target/tomcat-owb-x.y.z.jar (where x.y.z depends on the
 Apache OpenWebBeans version used during the build)
-should then be placed into the lib folder of the Tomcat
+should be processed by the Tomcat migration tool for Jakarta EE, and
+then be placed into the lib folder of the Tomcat
 installation.
 CDI support can then be enabled for all webapps in the container by adding
 the following listener in server.xml nested inside the
@@ -107,6 +108,11 @@ mvn clean && mvn package]]>
 desired root path where JAX-RS resources will be available.
   
 
+  
+The webapp as a whole should be processed by the Tomcat migration tool for
+Jakarta EE.
+  
+
   
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cb4b51f..5632768 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,6 +85,16 @@
   
 
   
+  
+
+  
+Update the OWB module to Apache OpenWebBeans 2.0.15. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.3.5. (remm)
+  
+
+  
 
 
   


-
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 reflect changes in planned version numbering.

2020-02-25 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 699d14a  Update to reflect changes in planned version numbering.
699d14a is described below

commit 699d14a274dd15a0f44db4d1445788acfea9f13d
Author: Mark Thomas 
AuthorDate: Tue Feb 25 12:36:18 2020 +

Update to reflect changes in planned version numbering.
---
 TOMCAT-NEXT.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index 5751a5b..ab47a46 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -25,7 +25,7 @@ Items carried over from the 9.0.x list:
 2.  Reduce instances of setters and getters for the same property existing on 
an
 object and its parent. This may require new objects to be exposed via JMX.
 
-New items for 10.0.0.x onwards:
+New items for 10.0.x onwards:
 
  1. Remove APR connector.
 
@@ -47,7 +47,7 @@ New items for 10.0.0.x onwards:
 
  7. Refactor DefaultServlet to use Ranges in parseRanges().
 
-Deferred until 10.0.x:
+Deferred until 10.1.x:
 
  1.  Remove the ExtensionValidator and associated classes (assuming that the
  minimum Java version is Java 9 or later).


-
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 10

2020-02-21 Thread 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 55157b4  Update to 10
55157b4 is described below

commit 55157b4bc9c6394e6694c9b168a36aa4771350d4
Author: remm 
AuthorDate: Fri Feb 21 18:18:53 2020 +0100

Update to 10

Add back version numbers. Avoid shade 3.2.2 for now.
---
 res/tomcat-maven/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/tomcat-maven/pom.xml b/res/tomcat-maven/pom.xml
index ff223ed..a48c2f0 100644
--- a/res/tomcat-maven/pom.xml
+++ b/res/tomcat-maven/pom.xml
@@ -29,7 +29,7 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-9.0.30
+10.0.0-M1
 
 
 
@@ -76,6 +76,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
+3.8.1
 
 1.8
 1.8
@@ -84,6 +85,7 @@
 
 org.apache.maven.plugins
 maven-shade-plugin
+3.2.1
 
 
 package


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

[tomcat] branch master updated: Update bundles list

2020-02-19 Thread 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 cf28c10  Update bundles list
cf28c10 is described below

commit cf28c107b8000a706dc25ea0f72dd1f0a4bfa6ae
Author: remm 
AuthorDate: Wed Feb 19 15:27:42 2020 +0100

Update bundles list

Graal 20 seems to properly trace bundles now, so the list is "useless".
---
 res/tomcat-maven/pom.xml  | 2 --
 res/tomcat-maven/tomcat-resource.json | 2 --
 2 files changed, 4 deletions(-)

diff --git a/res/tomcat-maven/pom.xml b/res/tomcat-maven/pom.xml
index 01e77ec..ff223ed 100644
--- a/res/tomcat-maven/pom.xml
+++ b/res/tomcat-maven/pom.xml
@@ -76,7 +76,6 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.5.1
 
 1.8
 1.8
@@ -85,7 +84,6 @@
 
 org.apache.maven.plugins
 maven-shade-plugin
-3.0.0
 
 
 package
diff --git a/res/tomcat-maven/tomcat-resource.json 
b/res/tomcat-maven/tomcat-resource.json
index 808d075..18763e0 100644
--- a/res/tomcat-maven/tomcat-resource.json
+++ b/res/tomcat-maven/tomcat-resource.json
@@ -24,7 +24,6 @@
 {"name":"org.apache.catalina.security.LocalStrings"},
 {"name":"org.apache.catalina.servlets.LocalStrings"},
 {"name":"org.apache.catalina.session.LocalStrings"},
-{"name":"org.apache.catalina.ssi.LocalStrings"},
 {"name":"org.apache.catalina.startup.LocalStrings"},
 {"name":"org.apache.catalina.storeconfig.LocalStrings"},
 {"name":"org.apache.catalina.tribes.group.LocalStrings"},
@@ -62,7 +61,6 @@
 {"name":"org.apache.tomcat.util.descriptor.tld.LocalStrings"},
 {"name":"org.apache.tomcat.util.descriptor.web.LocalStrings"},
 {"name":"org.apache.tomcat.util.digester.LocalStrings"},
-{"name":"org.apache.tomcat.util.file.LocalStrings"},
 {"name":"org.apache.tomcat.util.http.LocalStrings"},
 {"name":"org.apache.tomcat.util.http.parser.LocalStrings"},
 {"name":"org.apache.tomcat.util.json.LocalStrings"},


-
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 reflect new version numbering plans

2020-02-13 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 0e2f627  Update to reflect new version numbering plans
0e2f627 is described below

commit 0e2f6273e201a371559ad2769614ebd673efa283
Author: Mark Thomas 
AuthorDate: Thu Feb 13 18:07:35 2020 +

Update to reflect new version numbering plans

I wouldn't normally do this but I think it makes sense in order to
reduce opportunities for user confusion.
---
 webapps/docs/changelog.xml | 118 -
 1 file changed, 52 insertions(+), 66 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c3fc696..cb08195 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,9 +44,37 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+  
+
+  This release contains all of the changes upto and including those in
+  Apache Tomcat 9.0.31 plus the additional changes listed below. (markt)
+
+  
   
 
+  
+Refactor recycle facade system property into a new connector attribute
+named discardFacades and enable it by default. (remm)
+  
+  
+Update to Jakarta Servlet 5.0, Jakarta Server Pages 3.0. Jakarta
+Expression Language 4.0, Jakarta WebSocket 2.0, Jakarta Authentication
+2.0 and Jakarta Annotations 2.0. (markt)
+  
+  
+Remove GenericPrincipal.getPassword. The credentials should remain
+managed by the realm. (remm)
+  
+  
+Add connection pooling to JNDI realm. (remm)
+  
+  
+Use request-character-encoding and
+response-character-encoding in
+conf/web.xml to set the default request and response
+character encodings to UTF-8. (markt)
+  
   
 Store config compatibility with HostWebXmlCacheCleaner listener. (remm)
   
@@ -68,6 +96,25 @@
   
   
 
+  
+Update endpoint cache sizes defaults. (remm)
+  
+  
+Remove unused NIO blocking selector. (remm)
+  
+  
+When using an AJP Connector, convert Java Servlet specific request
+attributes to the Jakarta Servlet equivalent. (markt)
+  
+  
+When reporting / logging invalid HTTP headers encode any non-printing
+characters using the 0xNN form. (markt)
+  
+  
+Remove duplication of HTTP/1.1 configuration on the HTTP/2
+UpgradeProtocol element. Configuration from the main Connector element
+will now be used. (remm)
+  
   
 When the NIO or APR/native connectors were configured with
 useAsyncIO="true" and a zero length read or write was
@@ -103,6 +150,10 @@
   
 
   
+53620: JULI now only creates logging files when there is a
+log entry to write. Based on a patch by Karol Bucek. (markt)
+  
+  
 Update implementated specification version information in a few places
 where it has not been updated for Jakarta EE 9. (markt)
   
@@ -117,70 +168,5 @@
 
   
 
-
-  
-
-  This release contains all of the changes upto and including those in
-  Apache Tomcat 9.0.31 plus the additional changes listed below. (markt)
-
-  
-  
-
-  
-Refactor recycle facade system property into a new connector attribute
-named discardFacades and enable it by default. (remm)
-  
-  
-Update to Jakarta Servlet 5.0, Jakarta Server Pages 3.0. Jakarta
-Expression Language 4.0, Jakarta WebSocket 2.0, Jakarta Authentication
-2.0 and Jakarta Annotations 2.0. (markt)
-  
-  
-Remove GenericPrincipal.getPassword. The credentials should remain
-managed by the realm. (remm)
-  
-  
-Add connection pooling to JNDI realm. (remm)
-  
-  
-Use request-character-encoding and
-response-character-encoding in
-conf/web.xml to set the default request and response
-character encodings to UTF-8. (markt)
-  
-
-  
-  
-
-  
-Update endpoint cache sizes defaults. (remm)
-  
-  
-Remove unused NIO blocking selector. (remm)
-  
-  
-When using an AJP Connector, convert Java Servlet specific request
-attributes to the Jakarta Servlet equivalent. (markt)
-  
-  
-When reporting / logging invalid HTTP headers encode any non-printing
-characters using the 0xNN form. (markt)
-  
-  
-Remove duplication of HTTP/1.1 configuration on the HTTP/2
-UpgradeProtocol element. Configuration from the main Connector element
-will now be used. (remm)
-  
-
-  
-  
-
-  
-53620: JULI now

[tomcat] branch master updated: Update Maven snapshot version

2020-01-14 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 8ae9b83  Update Maven snapshot version
8ae9b83 is described below

commit 8ae9b83f108ce48ee24d11015c6575537666e11e
Author: Mark Thomas 
AuthorDate: Tue Jan 14 21:17:57 2020 +

Update Maven snapshot version
---
 res/maven/mvn-pub.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index fee8d8e..67d36ea 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
@@ -481,7 +481,7 @@
   
   
-  
+  
   
 


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

[tomcat] branch master updated: Update changelog

2020-01-08 Thread schultz

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

schultz 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 fb5e34c  Update changelog
fb5e34c is described below

commit fb5e34cea9647234aa96f81ef40d0904a2bbe1d5
Author: Christopher Schultz 
AuthorDate: Wed Jan 8 09:03:54 2020 -0500

Update changelog
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c013b2f..bf6ce4a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -88,6 +88,10 @@
 pattern * or *.jar is set or added to
 tomcat.util.scan.StandardJarScanFilter.jarsToSkip. 
(isapir)
   
+  
+Do not throw a NullPointerException when an MBean or operation cannot
+be found by the JMXProxyServlet. (schultz)
+  
 
   
   


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

[tomcat] branch master updated: Update Korean translations

2020-01-04 Thread woonsan

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

woonsan 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 bc7f5b8  Update Korean translations
bc7f5b8 is described below

commit bc7f5b8c0c84d36de7715ac6d9d98777459b0935
Author: Woonsan Ko 
AuthorDate: Sat Jan 4 22:27:23 2020 -0500

Update Korean translations
---
 java/org/apache/catalina/webresources/LocalStrings_ko.properties | 2 ++
 java/org/apache/tomcat/websocket/LocalStrings_ko.properties  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/java/org/apache/catalina/webresources/LocalStrings_ko.properties 
b/java/org/apache/catalina/webresources/LocalStrings_ko.properties
index e0d288e..a0a93e5 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_ko.properties
@@ -25,6 +25,8 @@ cache.backgroundEvictFail=백그라운드 캐시 퇴거 (cache eviction) 프로
 cache.objectMaxSizeTooBig=objectMaxSize를 위한 값 [{0}]kB이, maxSize/20인 최대한계값 보다 
커서, [{1}]kB로 줄여졌습니다.
 cache.objectMaxSizeTooBigBytes=[{0}]kB를 캐시하기 위해, 최대 객체 크기로서 지정된 값이 
Integer.MAX_VALUE 바이트보다 큰데, Integer.MAX_VALUE는 캐시될 수 있는 최대 크기입니다. 한계 값을 
Integer.MAX_VALUE 바이트로 설정하겠습니다.
 
+cachedResource.invalidURL=URL [{0}]이(가) 유효하지 않기 때문에 
CachedResourceURLStreamHandler 인스턴스를 생성할 수 없습니다.
+
 classpathUrlStreamHandler.notFound=쓰레드 컨텍스트 클래스로더 또는 현재 클래스의 클래스로더를 사용하여, 리소스 
[{0}]을(를) 로드할 수 없습니다.
 
 dirResourceSet.manifestFail=[{0}](으)로부터 manifest를 읽지 못했습니다.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties 
b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 7ace6fa..0ddbe24 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -35,6 +35,7 @@ caseInsensitiveKeyMap.nullKey=널인 키들은 허용되지 않습니다.
 
 futureToSendHandler.timeout=[{0}] [{1}]이(가) 완료되기를 기다린 후, 작업 제한 시간을 초과했습니다.
 
+perMessageDeflate.alreadyClosed=해당 transformer가 이미 닫혔으므로 더이상 사용될 수 없습니다.
 perMessageDeflate.deflateFailed=압축된 웹소켓 프레임의 압축을 풀지 못했습니다.
 perMessageDeflate.duplicateParameter=[{0}] 확장 파라미터가 중복 정의되어 있습니다.
 perMessageDeflate.invalidState=유효하지 않은 상태


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

[tomcat] branch master updated: Update Windows server versions

2019-12-19 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new cc48d0d  Update Windows server versions
cc48d0d is described below

commit cc48d0dea72b797fc8131b4de9f06100dacf83ed
Author: Mark Thomas 
AuthorDate: Thu Dec 19 23:13:52 2019 +

Update Windows server versions

Server 2008 R2 is approaching EOL so I've updated my test env to Server
2019 and confirmed SPNEGO still works.
---
 webapps/docs/windows-auth-howto.xml | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/webapps/docs/windows-auth-howto.xml 
b/webapps/docs/windows-auth-howto.xml
index 53cdf43..72867ba 100644
--- a/webapps/docs/windows-auth-howto.xml
+++ b/webapps/docs/windows-auth-howto.xml
@@ -69,9 +69,11 @@ the places it is used.
 Tomcat must run as the domain account with which the SPN has been 
associated
 or as domain admin. It is NOT recommended to run Tomcat under 
a
 domain admin user.
-The domain name (DEV.LOCAL) is not case sensitive when used in
-the ktpass command, nor when used in jaas.conf
-The domain must be specified when using the ktpass command
+Convention is that the domain name (dev.local) is always used 
in
+lower case. The domain name is typically not case sensitive.
+Convention is that the Kerberos realm name (DEV.LOCAL) is 
always
+used in upper case. The realm name is case sensitive.
+The domain must be specified when using the ktpass command.
 
 There are four components to the configuration of the built-in Tomcat
 support for Windows authentication. The domain controller, the server hosting
@@ -80,8 +82,8 @@ machine. The following sections describe the configuration 
required for each
 component.
 The names of the three machines used in the configuration examples below are
 win-dc01.dev.local (the domain controller), win-tc01.dev.local (the Tomcat
-instance) and win-pc01.dev.local (client). All are members of the DEV.LOCAL
-domain.
+instance) and win-pc01.dev.local (client). All are members of the
+dev.local domain.
 Note: In order to use the passwords in the steps below, the domain password
 policy had to be relaxed. This is not recommended for production environments.
 
@@ -114,14 +116,14 @@ policy had to be relaxed. This is not recommended for 
production environments.
   user is test with a password of testpass.
   
   The above steps have been tested on a domain controller running Windows
-  Server 2008 R2 64-bit Standard using the Windows Server 2003 functional level
+  Server 2019 Standard using the Windows Server 2016 functional level
   for both the forest and the domain.
   
   
 
   
-  These steps assume that Tomcat and a Java 6 JDK/JRE have already been
-  installed and configured and that Tomcat is running as the tc01@DEV.LOCAL
+  These steps assume that Tomcat and a Java 8 JDK/JRE have already been
+  installed and configured and that Tomcat is running as the tc01@dev.local
   user. The steps to configure the Tomcat instance for Windows authentication
   are as follows:
   
@@ -180,7 +182,7 @@ com.sun.security.jgss.krb5.accept {
   may be used that will simply return a Principal based on the authenticated
   user name that does not have any roles.
   The above steps have been tested on a Tomcat server running Windows Server
-  2008 R2 64-bit Standard with an Oracle 1.6.0_24 64-bit JDK.
+  2019 Standard with AdoptOpenJDK 8u232-b09 (64-bit).
   
 
   


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

[tomcat] branch master updated: Update optimisation for java.lang.Record added in Java 14

2019-12-16 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new a71c379  Update optimisation for java.lang.Record added in Java 14
a71c379 is described below

commit a71c379021a03c49834d168e0c90a88beabeb366
Author: Mark Thomas 
AuthorDate: Mon Dec 16 16:08:47 2019 +

Update optimisation for java.lang.Record added in Java 14
---
 java/javax/el/ImportHandler.java |  3 ++-
 test/javax/el/TestImportHandlerStandardPackages.java |  6 ++
 webapps/docs/changelog.xml   | 10 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index eb9e270..cfabd9d 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/el/ImportHandler.java
@@ -137,7 +137,7 @@ public class ImportHandler {
 standardPackages.put("javax.servlet.jsp", servletJspClassNames);
 
 Set javaLangClassNames = new HashSet<>();
-// Taken from Java 11 EA18 Javadoc
+// Taken from Java 14 EA27 Javadoc
 // Interfaces
 javaLangClassNames.add("Appendable");
 javaLangClassNames.add("AutoCloseable");
@@ -179,6 +179,7 @@ public class ImportHandler {
 javaLangClassNames.add("Process");
 javaLangClassNames.add("ProcessBuilder");
 javaLangClassNames.add("ProcessBuilder.Redirect");
+javaLangClassNames.add("Record");
 javaLangClassNames.add("Runtime");
 javaLangClassNames.add("Runtime.Version");
 javaLangClassNames.add("RuntimePermission");
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index cd4e64e..4d9c01a 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -61,10 +61,8 @@ public class TestImportHandlerStandardPackages {
 // 9 (and later) so it is not necessary that this is executed on
 // every test run. The intention is that it will catch new classes
 // when the tests are run on a newer JRE.
-// The latest versions of the JRE where this test is known to pass 
are
-// - OpenJDK 11.0.1
-// - OpenJDK 12 EA 26
-// - OpenJDK 13 EA 02
+// The latest version of the JRE where this test is known to pass 
is
+// - OpenJDK 14 EA 27
 if (!JreCompat.isJre9Available()) {
 return;
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e62349..96f5512 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -79,6 +79,16 @@
   
 
   
+  
+
+  
+Update the performance optimisation for using expressions in tags that
+depend on uninitialised tag attributes with implied scope to make the
+performance optimisation aware of the new public class
+(java.lang.Record) added in Java 14. (markt)
+  
+
+  
   
 
   


-
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 9.0.30

2019-12-12 Thread 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 c7581e0  Update to 9.0.30
c7581e0 is described below

commit c7581e0caf1451eed84f9a353f1bcfd88be782b4
Author: remm 
AuthorDate: Thu Dec 12 11:57:57 2019 +0100

Update to 9.0.30
---
 modules/owb/pom.xml  | 2 +-
 res/tomcat-maven/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 69a0202..087bc07 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -36,7 +36,7 @@
 1.0
 1.0
 1.0.1
-9.0.27
+9.0.30
 
 
 
diff --git a/res/tomcat-maven/pom.xml b/res/tomcat-maven/pom.xml
index 7944091..7e6c174 100644
--- a/res/tomcat-maven/pom.xml
+++ b/res/tomcat-maven/pom.xml
@@ -29,7 +29,7 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-9.0.27
+9.0.30
 
 
 


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

[tomcat] branch master updated: Update Korean translations

2019-12-05 Thread woonsan

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

woonsan 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 e6d4afe  Update Korean translations
e6d4afe is described below

commit e6d4afe477a9d0d8d4942a297eb43da2a1a209e6
Author: Woonsan Ko 
AuthorDate: Thu Dec 5 22:16:47 2019 -0500

Update Korean translations
---
 java/org/apache/catalina/core/LocalStrings_ko.properties   | 4 
 java/org/apache/coyote/LocalStrings_ko.properties  | 4 
 java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties 
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 14a6bfe..43ce1b7 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -94,6 +94,10 @@ aprListener.wrongFIPSMode=예기치 않은 AprLifecycleListener의 
FIPSMode 옵
 asyncContextImpl.asyncDispachError=비동기 디스패치 도중 오류 발생
 asyncContextImpl.asyncRunnableError=AsyncContext.start()를 통해, 비동기로 Runnable을 
처리하는 도중 오류 발생
 asyncContextImpl.dispatchingStarted=비동기 디스패치 오퍼레이션이 이미 호출되었습니다. 동일한 비동기 사이클 
내에서, 추가적인 비동기 디스패치 오퍼레이션은 허용되지 않습니다.
+asyncContextImpl.fireOnComplete=등록된 AsyncListener들에 onComplete() 이벤트를 호출합니다.
+asyncContextImpl.fireOnError=등록된 AsyncListener들에 onError() 이벤트를 호출합니다.
+asyncContextImpl.fireOnStartAsync=등록된 AsyncListener들에 onStartAsync() 이벤트를 
호출합니다.
+asyncContextImpl.fireOnTimeout=등록된 AsyncListener들에 onTimeout() 이벤트를 호출합니다.
 asyncContextImpl.noAsyncDispatcher=ServletContext로부터 반환된 디스패처는 비동기 디스패치를 지원하지 
않습니다.
 asyncContextImpl.onCompleteError=타입 [{0}]의 리스너를 위한 onComplete() 호출이 실패했습니다.
 asyncContextImpl.onErrorError=타입 [{0}]의 리스너를 위한 onError() 호출이 실패했습니다.
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties 
b/java/org/apache/coyote/LocalStrings_ko.properties
index 3f847ea..793ab52 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -33,6 +33,8 @@ abstractProcessor.pushrequest.notsupported=이 프로토콜은 서버 push 요
 abstractProcessor.socket.ssl=SSL 속성들을 얻으려는 중 예외 발생
 
 abstractProtocol.mbeanDeregistrationFailed=MBean 서버 [{1}](으)로부터, [{0}](이)라는 
이름의 MBean의 등록을 제거하지 못했습니다.
+abstractProtocol.processorRegisterError=RequestProcessor 구성요소를 등록하는 중 오류 발생
+abstractProtocol.processorUnregisterError=RequestProcessor 구성요소를 등록 해제하는 중 오류 
발생
 
 abstractProtocolHandler.asyncTimeoutError=비동기 제한 시간 초과를 처리하는 동안 오류 발생
 abstractProtocolHandler.destroy=프로토콜 핸들러 [{0}]을(를) 소멸시킵니다.
@@ -46,6 +48,8 @@ abstractProtocolHandler.stop=프로토콜 핸들러 [{0}]을(를) 중지시킵
 
 asyncStateMachine.invalidAsyncState=비동기 상태가 [{1}]인 요청에 대하여, [{0}]을(를) 호출하는 것은 
유효하지 않습니다.
 
+compressionConfig.ContentEncodingParseFail=압축이 이미 사용되는지 여부를 점검하는 중, 
Content-Encoding 헤더를 파싱하지 못했습니다.
+
 request.notAsync=오직 비동기 처리 또는 HTTP 업그레이드 처리 시에만, Non-blocking IO로의 전환이 유효합니다.
 request.nullReadListener=setReadListener()에 전달된 리스너는 널일 수 없습니다.
 request.readListenerSet=Non-blocking 읽기 리스너가 이미 설정되어 있습니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index fca8761..922b50d 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -68,6 +68,8 @@ endpoint.debug.pollerAddDo=Poller에 소켓 [{0}]을(를) 추가합니다.
 endpoint.debug.pollerProcess=다음 이벤트(들)을 위해 소켓 [{0}]을(를) 처리합니다: [{1}]
 endpoint.debug.pollerRemove=Poller로부터 [{0}]을(를) 제거하려 시도 중
 endpoint.debug.pollerRemoved=Poller로부터 [{0}]을(를) 제거했습니다.
+endpoint.debug.registerRead=[{0}]을(를) 위한 readInterest를 등록했습니다.
+endpoint.debug.registerWrite=[{0}]을(를) 위한 writeInterest를 등록했습니다.
 endpoint.debug.socket=소켓 [{0}]
 endpoint.debug.socketTimeout=제한 시간 초과로 처리합니다: [{0}]
 endpoint.debug.unlock.fail=포트 [{0}]에 대한 accept의 잠금을 풀고자 시도하는 중 예외 발생


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

[tomcat] branch master updated: Update changelog

2019-12-04 Thread 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.git


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

commit 11339204566d309a987e18c330b420fd84814674
Author: Mark Thomas 
AuthorDate: Wed Dec 4 18:28:21 2019 +

Update changelog
---
 webapps/docs/changelog.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5ed9c6d..80949ec 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -100,6 +100,11 @@
 (remm)
   
   
+63931: Improve timeout handling for asyncIO to ensure that
+blocking operations see a SocketTimeoutException if one
+occurs. (remmm/markt)
+  
+  
 63932: By default, do not compress content that has a strong
 ETag. This behaviour is configuration for the HTTP/1.1 and HTTP/2
 connectors via the new Connector attribute


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

[tomcat] branch master updated: Update changelog

2019-11-30 Thread 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.git


The following commit(s) were added to refs/heads/master by this push:
 new 5a17fb7  Update changelog
5a17fb7 is described below

commit 5a17fb70cdad1c329ea203309f69803c930670f1
Author: Mark Thomas 
AuthorDate: Sat Nov 30 11:58:43 2019 +

Update changelog
---
 webapps/docs/changelog.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3d46430..99094ae 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -57,6 +57,12 @@
 changes introduced in 9.0.28. Connections to URLs obtained for JAR
 resources could not be cast to JarURLConnection. (markt)
   
+  
+63939: Correct the same origin check in the CORS filter. An
+origin with an explicit default port is now considered to be the same 
as
+an origin without a deafult port and origins are now compared in a
+case-sensitive manner as required by the CORS specification. (markt)
+  
 
   
   


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

Re: [tomcat] branch master updated: Update with the release of Graal 19.3

2019-11-29 Thread Rémy Maucherat

On Thu, Nov 28, 2019 at 10:39 AM  wrote:

>  Missing items for better Tomcat functionality:
>  
> -  Java 11: ALPN for TLS, TLS 1.3, etc
>BeanInfo support: BeanInfo use in JSP taglibs must be configured
>  manually in descriptors
>Java serialization: Clustering, session persistence
> -  Static linking configuration: JSSE elliptic curve support,
> -tomcat-native support when creating an image with static
> linking
> +  Static linking configuration: tomcat-native support when
> creating
> +an image with static linking
>JMX: Tomcat monitoring and management
>  
>

As you can see here, this is a rather huge Graal update for Tomcat as JSSE
TLS is now functional and TLS is also usable in a container environment
thanks to static linking of the needed libraries.
I did some TLS Tomcat benchmarks with the "EE" version since it is rather
"feature complete" now and I am quite disappointed though. Better luck next
time I guess.

Rémy

[tomcat] branch master updated: Update with the release of Graal 19.3

2019-11-28 Thread 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 ab95586  Update with the release of Graal 19.3
ab95586 is described below

commit ab955860e6e92dc272911a67feee5706add62098
Author: remm 
AuthorDate: Thu Nov 28 10:39:11 2019 +0100

Update with the release of Graal 19.3

Java 9+ support in native images will need updates because at the moment
it sets the jre9Available flag to false. Of course since this is Graal
the Java 9 support has a small footprint: "oh, there's no module support
with native images".
---
 webapps/docs/graal.xml | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/webapps/docs/graal.xml b/webapps/docs/graal.xml
index 852de70..cb73078 100644
--- a/webapps/docs/graal.xml
+++ b/webapps/docs/graal.xml
@@ -57,7 +57,7 @@
   
 Download and install GraalVM. The first step is then to add the
 native-image tool.
-export JAVA_HOME=/absolute...path...to/graalvm-ce-x.y.z
+export JAVA_HOME=/absolute...path...to/graalvm-ce-javaX-x.y.z
 cd $JAVA_HOME/bin
 ./gu install native-image
 Download the Tomcat Maven packaging from
@@ -103,7 +103,7 @@ ant -Dwebapp.name=somewebapp -f 
graal-webapp.ant.xml
   
 Run the GraalVM substrate VM using the trace agent:
 $JAVA_HOME/bin/java\
-
-agentlib:native-image-agent=trace-output=$TOMCAT_MAVEN/target/trace-file.json\
+-agentlib:native-image-agent=config-output-dir=$TOMCAT_MAVEN/target/\
 -Dcatalina.base=. 
-Djava.util.logging.config.file=conf/logging.properties\
 -jar target/tomcat-maven-1.0.jar
   
@@ -117,11 +117,7 @@ ant -Dwebapp.name=somewebapp -f 
graal-webapp.ant.xml
   
 
   
-Once that is done, the VM may be shut down. The descriptors can now be
-generated from the trace file.
-$JAVA_HOME/bin/native-image-configure generate\
---trace-input=$TOMCAT_MAVEN/target/trace-file.json\
---output-dir=$TOMCAT_MAVEN/target
+The descriptors have now been generated in the agent output directory.
 At this point, further configuration must be made to add items that are
 not traced, including: base interfaces, resource bundles, BeanInfo based
 reflection, etc. Please refer to the Graal documentation for more
@@ -179,12 +175,11 @@ ant -Dwebapp.name=somewebapp -f 
graal-webapp.ant.xml
   
 Missing items for better Tomcat functionality:
 
-  Java 11: ALPN for TLS, TLS 1.3, etc
   BeanInfo support: BeanInfo use in JSP taglibs must be configured
 manually in descriptors
   Java serialization: Clustering, session persistence
-  Static linking configuration: JSSE elliptic curve support,
-tomcat-native support when creating an image with static linking
+  Static linking configuration: tomcat-native support when creating
+an image with static linking
   JMX: Tomcat monitoring and management
 
   


-
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 OWB 2.0.13

2019-11-26 Thread 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 c36e285  Update to OWB 2.0.13
c36e285 is described below

commit c36e285bc319155725da2be6d967a5a93365d862
Author: remm 
AuthorDate: Tue Nov 26 11:57:24 2019 +0100

Update to OWB 2.0.13
---
 modules/owb/pom.xml| 2 +-
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 4be4fb8..69a0202 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,7 +29,7 @@
 Apache Tomcat CDI 2 support
 Apache Tomcat CDI 2 support using Apache 
OpenWebBeans
 
-2.0.12
+2.0.13
 jar
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 10f497b..5d77584 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -92,6 +92,9 @@
 scripts to avoid the expansion of *) as it caused various
 regressions, particularly with daemon.sh. (markt)
   
+  
+Update the OWB module to Apache OpenWebBeans 2.0.13. (remm)
+  
 
   
 


-
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 CXF 3.3.4

2019-11-06 Thread 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 eb1d0e8  Update to CXF 3.3.4
eb1d0e8 is described below

commit eb1d0e84e7dea7d8db8ba9137840e9efb19f72df
Author: remm 
AuthorDate: Wed Nov 6 11:09:49 2019 +0100

Update to CXF 3.3.4
---
 modules/cxf/pom.xml| 2 +-
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 814789b..23eb7e9 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,7 +29,7 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.3.3
+3.3.4
 jar
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 851b817..ef998a8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -159,6 +159,9 @@
 63838: Suppress reflexive access warnings when running the
 unit tests on the command line. (markt)
   
+  
+Update the CXF module to Apache CXF 3.3.4. (remm)
+  
 
   
 


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

1 2 >

1 - 100 of 144 matches

Mail list logo