Re: [NOTICE] Branch renaming starting shortly

[Rémy Maucherat]

On Fri, May 21, 2021 at 10:51 PM Mark Thomas  wrote:

> On 21/05/2021 21:38, Rémy Maucherat wrote:
> > On Fri, May 21, 2021 at 10:30 PM Mark Thomas  wrote:
> >
> >> On 21/05/2021 21:20, Rémy Maucherat wrote:
> >>> On Fri, May 21, 2021 at 10:17 PM Mark Thomas  wrote:
> >>>
>  On 21/05/2021 21:06, Mark Thomas wrote:
> > On 21/05/2021 20:55, Mark Thomas wrote:
> >> I'll post to this thread as I complete each repo.
> >>
> >> After migration, everyone with a local clone will need to run this
> >> from the root of each clone:
> >>
> >> git branch -m master main
> >> git fetch origin
> >> git branch -u origin/main main
> >
> > Note you may also want to call
> > git remote prune origin
> >
> > Completed https://github.com/apache/tomcat-jakartaee-migration
> 
>  Along with
>  tomcat-training and tomcat-taglibs-*
> 
> >>>
> >>> Why the email notifications ? Will migrating Tomcat blow up our emails
> /
> >>> lists / etc ?
> >>
> >> It looks like gitbox isn't perfect. It sometimes misses notifications
> >> and sometimes duplicates them.
> >>
> >> It looks to be a one-off issue with taglibs-parent so far. I'm not sure
> >> of the exact root cause but I'm relived not to have seen similar issues
> >> with the other repos.
> >>
> >> tomcat-native and tomcat-connectors are done now too.
> >>
> >
> > All ok for me so far, fingers crossed for the big one ...
>
> :)
>
> All done.
>
> I've updated the CI systems (I hope). I suspect I've missed some
> references somewhere. We can fix those as we find them.
>

Ok, so we won at that git-russian roulette thing, it works perfect for me
and no unexpected email bombing.

Rémy


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

Re: [NOTICE] Branch renaming starting shortly

[Mark Thomas]

On 21/05/2021 21:38, Rémy Maucherat wrote:

On Fri, May 21, 2021 at 10:30 PM Mark Thomas  wrote:


On 21/05/2021 21:20, Rémy Maucherat wrote:

On Fri, May 21, 2021 at 10:17 PM Mark Thomas  wrote:


On 21/05/2021 21:06, Mark Thomas wrote:

On 21/05/2021 20:55, Mark Thomas wrote:

I'll post to this thread as I complete each repo.

After migration, everyone with a local clone will need to run this
from the root of each clone:

git branch -m master main
git fetch origin
git branch -u origin/main main


Note you may also want to call
git remote prune origin

Completed https://github.com/apache/tomcat-jakartaee-migration


Along with
tomcat-training and tomcat-taglibs-*



Why the email notifications ? Will migrating Tomcat blow up our emails /
lists / etc ?


It looks like gitbox isn't perfect. It sometimes misses notifications
and sometimes duplicates them.

It looks to be a one-off issue with taglibs-parent so far. I'm not sure
of the exact root cause but I'm relived not to have seen similar issues
with the other repos.

tomcat-native and tomcat-connectors are done now too.



All ok for me so far, fingers crossed for the big one ...


:)

All done.

I've updated the CI systems (I hope). I suspect I've missed some 
references somewhere. We can fix those as we find them.


Mark

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

[tomcat] branch main updated: Update after renaming branch to main

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new f0627aa  Update after renaming branch to main
f0627aa is described below

commit f0627aa10346539995e4546275b58d02bd7323ca
Author: Mark Thomas 
AuthorDate: Fri May 21 21:41:46 2021 +0100

Update after renaming branch to main
---
 .github/workflows/ci.yml  | 4 ++--
 BUILDING.txt  | 2 +-
 build.properties.default  | 2 +-
 webapps/docs/web-socket-howto.xml | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d380ea..b3079ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,10 +15,10 @@ name: Smoke Test
 on:
   push:
 branches:
-  - master
+  - main
   pull_request:
 branches:
-  - master
+  - main
 
 env:
   LC_ALL: en_US.UTF-8
diff --git a/BUILDING.txt b/BUILDING.txt
index 1577c6b..ba16b72 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -95,7 +95,7 @@ source distribution, do the following:
 (3.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@
 
 Clone the source using git, then checkout a specific major branch or
-master for the latest code development, or download and unpack a source
+main for the latest code development, or download and unpack a source
 package.
 
  *  Tomcat GitHub repository URL:
diff --git a/build.properties.default b/build.properties.default
index 83231eb..f1bd57b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -35,7 +35,7 @@ version.suffix=-dev
 #ant.tstamp.now=1620482400
 
 # - Source control flags -
-git.branch=master
+git.branch=main
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/web-socket-howto.xml 
b/webapps/docs/web-socket-howto.xml
index 7206ad0..709a2c3 100644
--- a/webapps/docs/web-socket-howto.xml
+++ b/webapps/docs/web-socket-howto.xml
@@ -44,9 +44,9 @@
 
 There are several example applications that demonstrate how the WebSocket 
API
can be used. You will need to look at both the client side https://github.com/apache/tomcat/tree/master/webapps/examples/websocket;>
+   
href="https://github.com/apache/tomcat/tree/main/webapps/examples/websocket;>
HTML and the server side https://github.com/apache/tomcat/tree/master/webapps/examples/WEB-INF/classes/websocket;>
+   
href="https://github.com/apache/tomcat/tree/main/webapps/examples/WEB-INF/classes/websocket;>
code.
 
 

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

Re: [NOTICE] Branch renaming starting shortly

[Rémy Maucherat]

On Fri, May 21, 2021 at 10:30 PM Mark Thomas  wrote:

> On 21/05/2021 21:20, Rémy Maucherat wrote:
> > On Fri, May 21, 2021 at 10:17 PM Mark Thomas  wrote:
> >
> >> On 21/05/2021 21:06, Mark Thomas wrote:
> >>> On 21/05/2021 20:55, Mark Thomas wrote:
>  I'll post to this thread as I complete each repo.
> 
>  After migration, everyone with a local clone will need to run this
>  from the root of each clone:
> 
>  git branch -m master main
>  git fetch origin
>  git branch -u origin/main main
> >>>
> >>> Note you may also want to call
> >>> git remote prune origin
> >>>
> >>> Completed https://github.com/apache/tomcat-jakartaee-migration
> >>
> >> Along with
> >> tomcat-training and tomcat-taglibs-*
> >>
> >
> > Why the email notifications ? Will migrating Tomcat blow up our emails /
> > lists / etc ?
>
> It looks like gitbox isn't perfect. It sometimes misses notifications
> and sometimes duplicates them.
>
> It looks to be a one-off issue with taglibs-parent so far. I'm not sure
> of the exact root cause but I'm relived not to have seen similar issues
> with the other repos.
>
> tomcat-native and tomcat-connectors are done now too.
>

All ok for me so far, fingers crossed for the big one ...

Rémy


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

svn commit: r1890087 - in /tomcat/site/trunk: docs/bugreport.html docs/ci.html docs/source.html xdocs/bugreport.xml xdocs/ci.xml xdocs/source.xml

[markt]

Author: markt
Date: Fri May 21 20:38:17 2021
New Revision: 1890087

URL: http://svn.apache.org/viewvc?rev=1890087=rev
Log:
Update after branch rename to main

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/xdocs/bugreport.xml
tomcat/site/trunk/xdocs/ci.xml
tomcat/site/trunk/xdocs/source.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1890087=1890086=1890087=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Fri May 21 20:38:17 2021
@@ -185,7 +185,7 @@ problem you are having before reporting
 
 
 
-  Tomcat 10.0 (master)
+  Tomcat 10.0 (main)
   
 https://tomcat.apache.org/tomcat-10.0-doc/changelog.html;>changelog.html
   
@@ -230,7 +230,7 @@ problem you are having before reporting
 https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html;>changelog.html
   
   
-https://github.com/apache/tomcat-connectors/blob/master/xdocs/miscellaneous/changelog.xml;>changelog.xml
+https://github.com/apache/tomcat-connectors/blob/main/xdocs/miscellaneous/changelog.xml;>changelog.xml
   
 
 
@@ -240,7 +240,7 @@ problem you are having before reporting
 https://tomcat.apache.org/native-doc/miscellaneous/changelog.html;>changelog.html
   
   
-https://github.com/apache/tomcat-native/blob/master/xdocs/miscellaneous/changelog.xml;>changelog.xml
+https://github.com/apache/tomcat-native/blob/main/xdocs/miscellaneous/changelog.xml;>changelog.xml
   
 
 

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1890087=1890086=1890087=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Fri May 21 20:38:17 2021
@@ -27,7 +27,7 @@ currently developed not yet released ver
 prepared and published by ASF Buildbot, using the latest source code.
 
 
-  http://ci.apache.org/projects/tomcat/tomcat10/docs/index.html; 
rel="nofollow">Tomcat 10.0.x (master)
+  http://ci.apache.org/projects/tomcat/tomcat10/docs/index.html; 
rel="nofollow">Tomcat 10.0.x (main)
   http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html; 
rel="nofollow">Tomcat 9.0.x
   http://ci.apache.org/projects/tomcat/tomcat85/docs/index.html; 
rel="nofollow">Tomcat 8.5.x
   http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html; 
rel="nofollow">Tomcat 7.0.x

Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1890087=1890086=1890087=diff
==
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Fri May 21 20:38:17 2021
@@ -40,16 +40,16 @@ found at git.apache.org or GitHub and ar
 This is the Git repository that contains the Apache Tomcat source code. 
There
 are currently four branches:
 
-master
+main
 9.0.x
 8.5.x
 7.0.x
 
-master is the primary development branch. Apache Tomcat 10.0.x releases are
+main is the primary development branch. Apache Tomcat 10.0.x releases are
 tagged from this branch. Development work generally occurs in this branch
 first.
 9.0.x is the stable release branch for Apache Tomcat 9.0.x. Generally, fixes
-are cherry picked from master into this branch.
+are cherry picked from main into this branch.
 8.5.x is the stable release branch for Apache Tomcat 8.5.x. Generally, fixes
 are cherry picked from 9.0.x into this branch.
 7.0.x is the stable release branch for Apache Tomcat 7.0.x. Generally, fixes

Modified: tomcat/site/trunk/xdocs/bugreport.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1890087=1890086=1890087=diff
==
--- tomcat/site/trunk/xdocs/bugreport.xml (original)
+++ tomcat/site/trunk/xdocs/bugreport.xml Fri May 21 20:38:17 2021
@@ -199,7 +199,7 @@ problem you are having before reporting
 
 
 
-  Tomcat 10.0 (master)
+  Tomcat 10.0 (main)
   
 https://tomcat.apache.org/tomcat-10.0-doc/changelog.html;>changelog.html
   
@@ -244,7 +244,7 @@ problem you are having before reporting
 https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html;>changelog.html
   
   
-https://github.com/apache/tomcat-connectors/blob/master/xdocs/miscellaneous/changelog.xml;>changelog.xml
+https://github.com/apache/tomcat-connectors/blob/main/xdocs/miscellaneous/changelog.xml;>changelog.xml
   
 
 
@@ -254,7 +254,7 @@ problem you are having before reporting
 

[GitHub] [tomcat] markt-asf closed pull request #327: Slight ui modifications

[GitBox]

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


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf closed pull request #223: Log compression

[GitBox]

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


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

Re: [NOTICE] Branch renaming starting shortly

[Mark Thomas]

On 21/05/2021 21:20, Rémy Maucherat wrote:

On Fri, May 21, 2021 at 10:17 PM Mark Thomas  wrote:


On 21/05/2021 21:06, Mark Thomas wrote:

On 21/05/2021 20:55, Mark Thomas wrote:

I'll post to this thread as I complete each repo.

After migration, everyone with a local clone will need to run this
from the root of each clone:

git branch -m master main
git fetch origin
git branch -u origin/main main


Note you may also want to call
git remote prune origin

Completed https://github.com/apache/tomcat-jakartaee-migration


Along with
tomcat-training and tomcat-taglibs-*



Why the email notifications ? Will migrating Tomcat blow up our emails /
lists / etc ?


It looks like gitbox isn't perfect. It sometimes misses notifications 
and sometimes duplicates them.


It looks to be a one-off issue with taglibs-parent so far. I'm not sure 
of the exact root cause but I'm relived not to have seen similar issues 
with the other repos.


tomcat-native and tomcat-connectors are done now too.

Mark

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

[tomcat-connectors] branch main updated: Update after rename of branch to main

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 6e5a5ec  Update after rename of branch to main
6e5a5ec is described below

commit 6e5a5ece201d75d714c161685c99df5315d18cd4
Author: Mark Thomas 
AuthorDate: Fri May 21 21:25:10 2021 +0100

Update after rename of branch to main
---
 HOWTO-RELEASE.txt  | 2 +-
 tools/jkrelease.sh | 6 +++---
 xdocs/miscellaneous/doccontrib.xml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 3586c0b..e051936 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -88,7 +88,7 @@ Here is an example for mod_jk 1.2.49
 git commit -a -m "Tag JK_1_2_48"
 git tag JK_1_2_48
 git push origin JK_1_2_48
-# reset master
+# reset main
 
 
 Build the mod_jk 1.2 documentation
diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index b75e117..6042a9f 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -53,7 +53,7 @@ usage() {
 echo "-r: revision or hash to package, only allowed in"
 echo "combination with '-b BRANCH', '-T' or '-d DIR'"
 echo "-b: package from branch BRANCH"
-echo "-T: package from trunk/master"
+echo "-T: package from trunk/main"
 echo "-d: package from local directory"
 echo "-o: owner used for creating tar archive"
 echo "-g: group used for creating tar archive"
@@ -175,10 +175,10 @@ if [ -n "$trunk" ]
 then
 if [ $USE_GIT -eq 1 ]
 then
-JK_REV=`git ls-remote $REPOS refs/heads/master | awk '{print $1}'`
+JK_REV=`git ls-remote $REPOS refs/heads/main | awk '{print $1}'`
 if [ -z "$JK_REV" ]
 then
-   echo "No git hash found via 'git ls-remote $REPOS 
refs/heads/master'"
+   echo "No git hash found via 'git ls-remote $REPOS refs/heads/main'"
exit 3
 fi
 JK_SUFFIX=-${JK_REV}
diff --git a/xdocs/miscellaneous/doccontrib.xml 
b/xdocs/miscellaneous/doccontrib.xml
index a0c9e6b..1589ef1 100644
--- a/xdocs/miscellaneous/doccontrib.xml
+++ b/xdocs/miscellaneous/doccontrib.xml
@@ -255,7 +255,7 @@ Writing Guide
 https://git-scm.com/;>Git Home
 
 
-https://github.com/apache/tomcat-connectors/tree/master/xdocs;>JK 
Docs repository
+https://github.com/apache/tomcat-connectors/tree/main/xdocs;>JK Docs 
repository
 
 
 

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

svn commit: r1890086 - in /tomcat/site/trunk: docs/index.html docs/source.html xdocs/index.xml xdocs/source.xml

[markt]

Author: markt
Date: Fri May 21 20:27:23 2021
New Revision: 1890086

URL: http://svn.apache.org/viewvc?rev=1890086=rev
Log:
Update after branch rename to main

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/source.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1890086=1890085=1890086=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri May 21 20:27:23 2021
@@ -128,7 +128,7 @@ bug fixes and improvements compared to v
 
 
 Full details of these changes, and all the other changes, are available in the
-https://github.com/apache/tomcat-jakartaee-migration/blob/master/CHANGES.md;>changelog.
+https://github.com/apache/tomcat-jakartaee-migration/blob/main/CHANGES.md;>changelog.
 
 
 

Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1890086=1890085=1890086=diff
==
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Fri May 21 20:27:23 2021
@@ -61,9 +61,9 @@ are cherry picked from 8.5.x into this b
 This is the Git repository that contains the Apache Tomcat Connectors source
 code. This includes mod_jk and isapi. There is currently one active branch:
 
-master
+main
 
-master is the primary development branch. Apache Tomcat Connectors 1.2.x 
releases
+main is the primary development branch. Apache Tomcat Connectors 1.2.x 
releases
 are tagged from this branch. Development work generally occurs in this branch
 first.
 A web based view of this repository is available via
@@ -73,9 +73,9 @@ first.
 This is the Git repository that contains the Apache Tomcat Native source
 code. There is currently one active branch:
 
-master
+main
 
-master is the primary development branch. Apache Tomcat Native 1.2.x 
releases
+main is the primary development branch. Apache Tomcat Native 1.2.x releases
 are tagged from this branch. Development work generally occurs in this branch
 first.
 A web based view of this repository is available via

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1890086=1890085=1890086=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Fri May 21 20:27:23 2021
@@ -153,7 +153,7 @@ bug fixes and improvements compared to v
 
 
 Full details of these changes, and all the other changes, are available in the
-https://github.com/apache/tomcat-jakartaee-migration/blob/master/CHANGES.md;>changelog.
+https://github.com/apache/tomcat-jakartaee-migration/blob/main/CHANGES.md;>changelog.
 
 
 

Modified: tomcat/site/trunk/xdocs/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1890086=1890085=1890086=diff
==
--- tomcat/site/trunk/xdocs/source.xml (original)
+++ tomcat/site/trunk/xdocs/source.xml Fri May 21 20:27:23 2021
@@ -75,9 +75,9 @@ are cherry picked from 8.5.x into this b
 This is the Git repository that contains the Apache Tomcat Connectors source
 code. This includes mod_jk and isapi. There is currently one active branch:
 
-master
+main
 
-master is the primary development branch. Apache Tomcat Connectors 1.2.x 
releases
+main is the primary development branch. Apache Tomcat Connectors 1.2.x 
releases
 are tagged from this branch. Development work generally occurs in this branch
 first.
 A web based view of this repository is available via
@@ -89,9 +89,9 @@ first.
 This is the Git repository that contains the Apache Tomcat Native source
 code. There is currently one active branch:
 
-master
+main
 
-master is the primary development branch. Apache Tomcat Native 1.2.x 
releases
+main is the primary development branch. Apache Tomcat Native 1.2.x releases
 are tagged from this branch. Development work generally occurs in this branch
 first.
 A web based view of this repository is available via



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

[tomcat-native] branch main updated: Update after rename of branch to main

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 075db78  Update after rename of branch to main
075db78 is described below

commit 075db788273f1f18dc7b5d8240bb6e44635cd338
Author: Mark Thomas 
AuthorDate: Fri May 21 21:23:02 2021 +0100

Update after rename of branch to main
---
 jnirelease.sh | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jnirelease.sh b/jnirelease.sh
index e867c88..6763b28 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -85,7 +85,7 @@ if [ "x$JKJNIEXT" = "x" ]; then
 echo ""
 echo "Unknown Git tag/branch"
 echo "Use:"
-echo "  --ver=|1.1.x|master|."
+echo "  --ver=|1.1.x|main|."
 echo ""
 exit 1
 fi
@@ -133,8 +133,8 @@ else
 exit 1
 fi
 
-if [ "x$JKJNIEXT" = "xmaster" ]; then
-JKJNIHASH=`git ls-remote $GITBASE refs/heads/master | awk '{print $1}'`
+if [ "x$JKJNIEXT" = "xmain" ]; then
+JKJNIHASH=`git ls-remote $GITBASE refs/heads/main | awk '{print $1}'`
 JKJNIVER="$JKJNIEXT-$JKJNIHASH"
 elif [ "x$JKJNIEXT" = "x1.1.x" ]; then
 JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.1.x | awk '{print $1}'`
@@ -166,14 +166,14 @@ if [ ! -d .git/refs/remotes/10.0.x ]; then
 git remote add -f 10.0.x ${TCJAVA_GITBASE}
 fi
 git remote update 10.0.x
-diffcount=`git diff HEAD remotes/10.0.x/master java/org/apache/tomcat/jni | wc 
-l`
+diffcount=`git diff HEAD remotes/10.0.x/main java/org/apache/tomcat/jni | wc 
-l`
 
 if [ $diffcount -ne 0 ]; then
 echo "WARNING: git subtree is not up to date with"
 echo " $TCJAVA_GITBASE"
 echo " Either correct now by running"
 echo " 'git rm -rf java/org/apache/tomcat/jni'"
-echo " 'git read-tree --prefix=java/org/apache/tomcat/jni/ -u 
10.0.x/master:java/org/apache/tomcat/jni'"
+echo " 'git read-tree --prefix=java/org/apache/tomcat/jni/ -u 
10.0.x/main:java/org/apache/tomcat/jni'"
 echo " 'git commit'"
 echo " or run this script with -f (force)"
 if [ "X$JKJNIFORCE" = "X1" ]

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

Re: [NOTICE] Branch renaming starting shortly

[Rémy Maucherat]

On Fri, May 21, 2021 at 10:17 PM Mark Thomas  wrote:

> On 21/05/2021 21:06, Mark Thomas wrote:
> > On 21/05/2021 20:55, Mark Thomas wrote:
> >> I'll post to this thread as I complete each repo.
> >>
> >> After migration, everyone with a local clone will need to run this
> >> from the root of each clone:
> >>
> >> git branch -m master main
> >> git fetch origin
> >> git branch -u origin/main main
> >
> > Note you may also want to call
> > git remote prune origin
> >
> > Completed https://github.com/apache/tomcat-jakartaee-migration
>
> Along with
> tomcat-training and tomcat-taglibs-*
>

Why the email notifications ? Will migrating Tomcat blow up our emails /
lists / etc ?

Rémy


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

Re: [NOTICE] Branch renaming starting shortly

[Mark Thomas]

On 21/05/2021 21:06, Mark Thomas wrote:

On 21/05/2021 20:55, Mark Thomas wrote:

I'll post to this thread as I complete each repo.

After migration, everyone with a local clone will need to run this 
from the root of each clone:


git branch -m master main
git fetch origin
git branch -u origin/main main


Note you may also want to call
git remote prune origin

Completed https://github.com/apache/tomcat-jakartaee-migration


Along with
tomcat-training and tomcat-taglibs-*

Mark

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

svn commit: r1890085 - in /tomcat/site/trunk: docs/source.html xdocs/index.xml xdocs/source.xml

[markt]

Author: markt
Date: Fri May 21 20:16:56 2021
New Revision: 1890085

URL: http://svn.apache.org/viewvc?rev=1890085=rev
Log:
Update after branch rename to main

Modified:
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/source.xml

Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1890085=1890084=1890085=diff
==
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Fri May 21 20:16:56 2021
@@ -28,7 +28,7 @@ control system:
 
 Git
 
-The ASF operates a dual master system for repositories that use Git as their
+The ASF operates a dual primary system for repositories that use Git as 
their
 primary version control system. This means committers may commit to either
 gitbox.apache.org or GitHub.
 
@@ -97,9 +97,9 @@ first.
 This is the Git repository that contains the parent POM for the Apache 
Tomcat
 Tag Libraries. There is currently one active branch:
 
-master
+main
 
-master is the only development branch. All development work occurs in this
+main is the only development branch. All development work occurs in this
 branch.
 A web based view of this repository is available via
 https://github.com/apache/tomcat-taglibs-parent;>GitHub.
@@ -108,9 +108,9 @@ branch.
 This is the Git repository that contains the Apache Tomcat Standard Tag
 Library. There is currently one active branch:
 
-master
+main
 
-master is the only development branch. All development work occurs in this
+main is the only development branch. All development work occurs in this
 branch.
 A web based view of this repository is available via
 https://github.com/apache/tomcat-taglibs-standard;>GitHub.
@@ -119,9 +119,9 @@ branch.
 This is the Git repository that contains the Apache Tomcat RDC Tag Library.
 There is currently one active branch:
 
-master
+main
 
-master is the only development branch. All development work occurs in this
+main is the only development branch. All development work occurs in this
 branch.
 A web based view of this repository is available via
 https://github.com/apache/tomcat-taglibs-rdc;>GitHub.
@@ -130,9 +130,9 @@ branch.
 This is the Git repository that contains the web site for the Apache Tomcat
 Tag Libraries. There is currently one active branch:
 
-master
+main
 
-master is the only development branch. All development work occurs in this
+main is the only development branch. All development work occurs in this
 branch.
 A web based view of this repository is available via
 https://github.com/apache/tomcat-taglibs-site;>GitHub.

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1890085=1890084=1890085=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Fri May 21 20:16:56 2021
@@ -4,7 +4,7 @@
   
 Apache Tomcat Project
 Welcome!
-
+
 
 
nA9F0GvGNjVCU9W7HBziONQVx6FehvgQglI1X7WPfRw
   

Modified: tomcat/site/trunk/xdocs/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1890085=1890084=1890085=diff
==
--- tomcat/site/trunk/xdocs/source.xml (original)
+++ tomcat/site/trunk/xdocs/source.xml Fri May 21 20:16:56 2021
@@ -38,7 +38,7 @@ control system:
 
 
 
-The ASF operates a dual master system for repositories that use Git as their
+The ASF operates a dual primary system for repositories that use Git as 
their
 primary version control system. This means committers may commit to either
 gitbox.apache.org or GitHub.
 
@@ -117,9 +117,9 @@ first.
 This is the Git repository that contains the parent POM for the Apache 
Tomcat
 Tag Libraries. There is currently one active branch:
 
-master
+main
 
-master is the only development branch. All development work occurs in this
+main is the only development branch. All development work occurs in this
 branch.
 A web based view of this repository is available via
 https://github.com/apache/tomcat-taglibs-parent;>GitHub.
@@ -130,9 +130,9 @@ branch.
 This is the Git repository that contains the Apache Tomcat Standard Tag
 Library. There is currently one active branch:
 
-master
+main
 
-master is the only development branch. All development work occurs in this
+main is the only development branch. All development work occurs in this
 branch.
 A web based view of this repository is available via
 https://github.com/apache/tomcat-taglibs-standard;>GitHub.
@@ -143,9 +143,9 @@ branch.
 This is the Git repository that contains the Apache Tomcat RDC Tag Library.
 There is currently one active branch:
 
-master
+main
 
-master is the only development branch. All development work occurs in this
+main is the only development branch. All 

[tomcat-taglibs-standard] branch main created (now 4d3880e)

[markt]

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

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git.


  at 4d3880e  minor changes as the code is now java 1.8

No new revisions were added by this update.

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

[tomcat-taglibs-site] branch main created (now d214394)

[markt]

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

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-site.git.


  at d214394  add Jenkinsfile fix pom to check snapshot dependencies

This branch includes the following new commits:

 new c6c39b6  First stab at a new m2 based site. Missing bits.
 new 543c549  Adjusting menus more. Using the Commons l Hooking in 
download page.
 new dc62883  Updating the menu
 new a14501d  Inlining the current custom bug.html page as 
issue-tracking.html. Modified to point to the local mail-list.html page.
 new e6c91f4  Making the pom a child of the taglibs-parent. Wondering if 
there's any reason for keeping the site separate.
 new 3ac45e7  Pulled in the binarydist and sourcedist pages from the old 
site as using.xml and building.xml
 new b6baa3a  Pulled over the tutorial page from the old site
 new 7f73887  Copied the news in from the html output of the old site. 
Needs spinning out into its own page with only recent headlines on the front 
page.
 new 3c1f39a  Fixing left over noise from copying page from Commons site
 new 03dd9ba  Adding spec section as helpful links, creating a news archive 
and moving the data over.
 new 4c272c2  Creating released, sandbox and deprecated pages
 new 6fd1fd6  Rewriting the front page a bit. Didn't like the old one.
 new 87d0e48  Making the home link relative. May or may not work out - is a 
bit odd locally.
 new 787c29f  Killing the link to adding a taglib. We have the Incubator 
nowadays, though there is good info in addtaglib.xml to extract. The building 
page needs a rewrite given we don't build in that anymore - maybe keep it for 
legacy builds.
 new 73a211c  Making the site.xml shared between all components
 new d632654  Renaming
 new 92b8094  Makes sense, I believe, for index.xml to be in the parent 
while site itself is a child. Gonna be interesting.
 new bb1b013  Setting the url, which is a subsite of 'site' and adjusting a 
few pages that need to look up a directory
 new e2ce661  For the site's purposes, Jakarta Taglibs. ie) ditch the Site
 new 57782d9  taglibs-site to site
 new c69f154  Moving site into proper rather than hiding in trunks-proper. 
Still no need for tags/branches
 new 1b7e3ff  Moving the index back to the site now that I've figured 
things out
 new d39f2f2  Making the site live at the top level, but moving most of the 
files down into a site subdirectory
 new b9753de  Copying logos over
 new aaf0a77  Missed the hidden guidelines page
 new f383589  Killing the link to the addtaglib page
 new 0611068  Putting the images in the right place to be picked up by the 
maven site plugin
 new bc6b1bf  Fixing the initial copyright date
 new d2903f7  Setting today's date in the news about m2 conversions
 new 93964a4  Moving issue tracking up a directory, else it won't override 
the default one
 new a3d941e  Can call this 'Site' again now I'm not trying to use variables
 new 798017b  Adding distributionManagement section for site deploys
 new d0ff346  scpexe works better
 new d0528c4  Moving the new maven subsites 'live'
 new 4aeb032  Moving the building page to a legacy location
 new e5c3b2e  Writing a new building page
 new f919de2  Fixing url to the site. It has no trunk
 new 834aabd  Point to new m2 site.
 new 7321e17  Ignore Thumbs.db for images directory.
 new ec6a998  JSTL 1.2, not 2.0
 new 6cb90d8  Updating Dormant page to show download link or svn; this 
allows us to delete the websites
 new d27e169  Pointing the site to the index rather than the intro for 
dormant libraries
 new 30400cd  Fixing links to image and jmstags svn
 new e7a870c  Moving datetime, i18n and random to deprecated
 new c5ca4ae  News on deprecation
 new 3ba85c1  Moving the Taglib site over to Tomcat
 new 1e0add5  Fixing svn location post move
 new 6a74916  Rebrand to Apache Taglibs
 new 63d4405  Updating news
 new 3622a93  Minor update to text as part of Jakarta->Tomcat
 new dc505ab  Jakarta -> Apache
 new e6751f4  Fixing link to Standard taglib
 new 359e410  Reordering the JSTL paragraph to mention the Apache taglib 
first and JSTL second
 new 035ca86  Adjusting links for old taglibs to point to Jakarta
 new ed299b5  Removing dead pages
 new 81a4116  Adding a section on formerly being Jakarta Taglibs so older 
taglibs may be found
 new d49b922  Commenting out jsp spec section. Not sure why it's there.
 new 1efa322  Update copyright year for TC tagslibs trunk.
 new 3f54ea6  Updating retired taglibs link to point to the new location 
for the page (attic)
 new 48396e4  Update copyright year.
 new bb35119  fix parent path
 new 31617c3  add basic svn ignore
 new c5628f2  s/2011/2012/g
 new ac78201  Removing link to Jakarta 

[tomcat-taglibs-rdc] branch main created (now d9269f7)

[markt]

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

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-rdc.git.


  at d9269f7  make this buildable in Jenkins

This branch includes the following new commits:

 new 04bd281  A reasonable svn:ignore to begin with.
 new d915e7a  Add the root directories for the upcoming multi-module m2 
build, split in three modules:  * taglibs-rdc: module for the taglib jar  * 
taglibs-rdc-examples: for the examples and sample apps war file  * 
taglibs-rdc-dist: for assembling the distros (two: source and binary -- and as 
before binary will contain, the above jar, war and tld, javadocs and tlddoc)
 new 461a076  Adding .txt extensions.
 new 250cf9d  Won't be executing this anytime soon.
 new 6334183  A shell for m2.
 new e52e145  Move Java sources to where they belong
 new 4a54ac5  Shell for resources.
 new 5c262e8  Move resources where m2 will expect them
 new 855cb90  Speech grammars are resources
 new 39b2abe  JSP 2.0 tag files will be packaged as is in META-INF, move to 
resources
 new 8593f44  We will probably use these styles with the antrun plugin to 
create the documentation, the m2 taglib plugin will require much work to 
process the current meta-data in .rdc files -- move to non-standard location
 new 91775df  Theres nothing in this directory anymore
 new 916532c  Kindly request the string taglib for a copy of the license
 new 684feda  Add a parent pom (comment out the modules since they aren't 
ready yet). Biggest chunk is to take care of dependency management.
 new 0f6a36a  Its 09.
 new 5e5c188  Shell for examples war module.
 new c24438c  Empty package structure, more to follow.
 new 47e6a3d  Remove ugliness where Java sources for sample apps were 
placed together with library source
 new c778471  Shell for resources coming soon.
 new f1c3267  Move resources to the m2 location in the module
 new 13661a3  Move war contents to the appropriate place in the war module
 new a439e38  Correct misplaced webapp artifacts (step 1 of 3)
 new 110ad8c  Correct misplaced webapp artifacts (step 2 of 3)
 new 22b758c  Correct misplaced webapp artifacts (step 3 of 3)
 new df233a7  Adding .txt extensions.
 new a72a93e  Add a placeholder home page for the taglib module, site will 
be primarily be with parent.
 new 696d7cd  Add a placeholder home page for the examples module, site 
will be primarily be with parent.
 new a10cab0  Add a changes report which taglibs-parent expects. 
Placeholder ATM, details later.
 new 44b3c10  Add a changes report which taglibs-parent expects. 
Placeholder ATM, details later.
 new 56ad1a2  Shell of main site for RDC taglib with parent.
 new 1433aa4  Nothing of interest in here anymore, moved to examples m2 
module
 new 7785466  Move home page to correct location and rename to index.html
 new 2aa9c39  Move the main meta-data file to non-standard location, we 
will antrun the TLD and documentation off this rather than using the taglib 
plugin
 new 32931c7  Remove now empty directory
 new 9f9e7e5  Nothing of interest in doc directory anymore. That completes 
the bulk of the reorg, now to attempt a functioning m2 build.
 new 68a9604  Remove ant build to be replaced by m2
 new 711f932  LICENSE and NOTICE for the taglib jar module.
 new d82debf  This gives us a jar, which is good, though yet untested. Note 
taglibs-parent uses non-standard Java source location (must be overridden 
here). Point to ponder whether its worth changing other taglibs such that the 
Java sources are in their expected place.
 new bb458b7  Wrong extension
 new 3f7d274  Ignore build artifacts.
 new 39bb8b6  Uncomment jar module. Its possible to build a jar now, but it 
doesn't contain a TLD yet (coming soon).
 new 2a4add9  Now for the fun part :-) The taglib plugin can't be used 
without some amount of work (the processing of .tag and .tagx files is off). 
Until we can un-inherit the plugin, we'll point it to a non-standard location, 
say src/main/tld and generate the TLD there (all the tag files nested in the 
default location -- src/main/resources/META-INF -- cause processing issues for 
the plugin reports as things stand).
 new 364ac7b  RDC taglib TLD will be generated here.
 new 9459f7a  Update the JSP 2.0 stylesheet to generate the TLD and docs 
with antrun. Allow for creation of either plain HTML documentation (for 
packaging with binary distro) or xdoc (for usage with m2 site). The XSLT 
parameter 'generationtarget' can be used for this purpose (values 'xdoc' or 
'html').
 new 68c7737  Generate the TLD and the TLDDoc off the existing meta-data. 
The TLD is styled out during the 'generate-resources' m2 phase so it can be 
packed in the jar and the TLDDoc variants (for binary distro and for site) are 
styled during the 'pre-site' m2 

[tomcat-taglibs-parent] 10/18: upgrade some maven plugins, jdk target is now 8

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 48c60666cad4e523b570745ab3d2f7b6dcb21195
Author: Olivier Lamy 
AuthorDate: Wed Mar 25 06:20:15 2020 +

upgrade some maven plugins, jdk target is now 8
---
 pom.xml | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d16a66..d126dd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache
 apache
-13
+23
   
 
   org.apache.taglibs
@@ -35,8 +35,8 @@
 
   
 
-1.5
-1.5
+8
+8
 UTF-8
 UTF-8
   
@@ -104,7 +104,7 @@
 
   org.apache.maven.plugins
   maven-compiler-plugin
-  3.1
+  3.8.1
   
 ${maven.compiler.source}
 ${maven.compiler.target}
@@ -114,12 +114,12 @@
 
   org.apache.maven.plugins
   maven-surefire-plugin
-  2.15
+  3.0.0-M4
 
 
   org.apache.maven.plugins
   maven-site-plugin
-  3.3
+  3.8.2
 
   
 
@@ -128,7 +128,7 @@
   
 org.apache.felix
 maven-bundle-plugin
-2.4.0
+4.2.1
 true
 
   
@@ -146,7 +146,7 @@
   
 org.apache.maven.plugins
 maven-javadoc-plugin
-2.9
+3.2.0
 
   true
   
@@ -169,17 +169,17 @@
   
 org.apache.maven.plugins
 maven-jxr-plugin
-2.3
+3.0.0
 
   
 org.apache.maven.plugins
 maven-project-info-reports-plugin
-2.7
+3.0.0
   
   
 org.apache.maven.plugins
 maven-surefire-report-plugin
-2.15
+3.0.0-M4
 
 
   

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

[tomcat-taglibs-parent] 18/18: simplify Jenkinsfile

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 5c359d08d86d0a358616af64c985b115e37ad91c
Author: olivier lamy 
AuthorDate: Sat Apr 11 16:07:23 2020 +1000

simplify Jenkinsfile
---
 Jenkinsfile | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dc0a883..13db84f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,19 +14,7 @@ pipeline {
   agent { node { label 'ubuntu' } }
   options { timeout( time: 120, unit: 'MINUTES' ) }
   steps {
-mavenBuild( "JDK 1.8 (latest)", "clean install" )
-script {
-  if (env.BRANCH_NAME == 'master') {
-mavenBuild( "JDK 1.8 (latest)", "deploy" )
-  }
-}
-  }
-}
-stage( "Build / Test - JDK11" ) {
-  agent { node { label 'ubuntu' } }
-  options { timeout( time: 120, unit: 'MINUTES' ) }
-  steps {
-mavenBuild( "JDK 11 (latest)", "clean install" )
+mavenBuild( "JDK 1.8 (latest)", "clean deploy" )
   }
 }
   }

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

[tomcat-taglibs-parent] 17/18: reformat pom and fix scm information

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit e786aea06fe6d8608069f2824ad56fe73f4379f6
Author: olivier lamy 
AuthorDate: Fri Apr 10 13:19:35 2020 +1000

reformat pom and fix scm information

Signed-off-by: olivier lamy 
---
 pom.xml | 41 +
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index d126dd1..3e0d74c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   4.0.0
   
 org.apache
@@ -47,9 +48,9 @@
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk
-
scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk
-http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk
+
scm:git:https://github.com/apache/tomcat-taglibs-parent
+
scm:git:https://github.com/apache/tomcat-taglibs-parent
+https://github.com/apache/tomcat-taglibs-parent
   
 
   
@@ -63,19 +64,19 @@
 
http://www.mail-archive.com/taglibs-user@tomcat.apache.org/
   
 
-  
-  Tomcat Dev List
-  dev-subscr...@tomcat.apache.org
-  dev-unsubscr...@tomcat.apache.org
-  dev@tomcat.apache.org
-  
http://mail-archives.apache.org/mod_mbox/tomcat-dev/
-  
-  
http://markmail.org/list/org.apache.tomcat.dev/
-  
http://www.nabble.com/Tomcat---Dev-f341.html
-  
http://www.mail-archive.com/dev@tomcat.apache.org/
-  
http://news.gmane.org/gmane.comp.tomcat.devel
-  
-  
+
+  Tomcat Dev List
+  dev-subscr...@tomcat.apache.org
+  dev-unsubscr...@tomcat.apache.org
+  dev@tomcat.apache.org
+  http://mail-archives.apache.org/mod_mbox/tomcat-dev/
+  
+
http://markmail.org/list/org.apache.tomcat.dev/
+
http://www.nabble.com/Tomcat---Dev-f341.html
+
http://www.mail-archive.com/dev@tomcat.apache.org/
+
http://news.gmane.org/gmane.comp.tomcat.devel
+  
+
 
   Old Taglibs User Archive
   
http://mail-archives.apache.org/mod_mbox/jakarta-taglibs-user/
@@ -151,7 +152,7 @@
   true
   
 http://download.oracle.com/javase/1.5.0/docs/api
-
+  
 
   
   
@@ -170,7 +171,7 @@
 org.apache.maven.plugins
 maven-jxr-plugin
 3.0.0
-
+  
   
 org.apache.maven.plugins
 maven-project-info-reports-plugin
@@ -180,7 +181,7 @@
 org.apache.maven.plugins
 maven-surefire-report-plugin
 3.0.0-M4
-
+  
 
   
 

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

[tomcat-taglibs-parent] 09/18: Happy New Year 2017

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 6754659e04afc6bfc3194c943c767b8eef7cf0ad
Author: Rainer Jung 
AuthorDate: Mon Jan 2 21:35:55 2017 +

Happy New Year 2017
---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index c81d228..b87b735 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Tomcat Taglib Parent
-Copyright 2000-2016 The Apache Software Foundation
+Copyright 2000-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

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

[tomcat-taglibs-parent] 13/18: fix jdk names

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 8d57248637ade2de3d034efef4c116fe762326eb
Author: olivier lamy 
AuthorDate: Fri Apr 10 10:52:44 2020 +1000

fix jdk names

Signed-off-by: olivier lamy 
---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0bd3ab7..0fb0afd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,10 +14,10 @@ pipeline {
   agent { node { label 'ubuntu' } }
   options { timeout( time: 120, unit: 'MINUTES' ) }
   steps {
-mavenBuild( "jdk11", "clean install" )
+mavenBuild( "JDK 1.8 (latest)", "clean install" )
 script {
   if (env.BRANCH_NAME == 'master') {
-mavenBuild( "jdk8", "deploy" )
+mavenBuild( "JDK 1.8 (latest)", "deploy" )
   }
 }
   }
@@ -26,7 +26,7 @@ pipeline {
   agent { node { label 'ubuntu' } }
   options { timeout( time: 120, unit: 'MINUTES' ) }
   steps {
-mavenBuild( "jdk11", "clean install" )
+mavenBuild( "JDK 11 (latest)", "clean install" )
   }
 }
   }

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

[tomcat-taglibs-parent] 11/18: add Jenkinsfile

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit c83b7e511e41a9f9bdb412a99bb79a38e14d452b
Author: olivier lamy 
AuthorDate: Fri Apr 10 09:41:54 2020 +1000

add Jenkinsfile

Signed-off-by: olivier lamy 
---
 Jenkinsfile | 65 +
 1 file changed, 65 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..e2b35ee
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,65 @@
+#!groovy
+
+pipeline {
+  agent any
+  options {
+durabilityHint('PERFORMANCE_OPTIMIZED')
+buildDiscarder(logRotator(numToKeepStr: '7', artifactNumToKeepStr: '2'))
+timeout(time: 60, unit: 'MINUTES')
+  }
+  stages {
+stage( "Parallel Stage" ) {
+  parallel {
+stage( "Build / Test - JDK8" ) {
+  agent { node { label 'ubuntu' } }
+  options { timeout( time: 120, unit: 'MINUTES' ) }
+  steps {
+mavenBuild( "jdk11", "clean install" )
+script {
+  if (env.BRANCH_NAME == 'master') {
+mavenBuild( "jdk8", "deploy" )
+  }
+}
+  }
+}
+stage( "Build / Test - JDK11" ) {
+  agent { node { label 'ubuntu' } }
+  options { timeout( time: 120, unit: 'MINUTES' ) }
+  steps {
+mavenBuild( "jdk11", "clean install" )
+  }
+}
+  }
+}
+  }
+}
+
+
+
+/**
+ * To other developers, if you are using this method above, please use the 
following syntax.
+ *
+ * mavenBuild("", "   "
+ *
+ * @param jdk the jdk tool name (in jenkins) to use for this build
+ * @param cmdline the command line in "  "`format.
+ * @return the Jenkinsfile step representing a maven build
+ */
+def mavenBuild(jdk, cmdline) {
+  def mvnName = 'maven3'
+  //def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" // 
".repository" //
+  //def settingsName = 'oss-settings.xml'
+  def mavenOpts = '-Xms2g -Xmx2g -Djava.awt.headless=true'
+
+  withMaven(
+  maven: mvnName,
+  jdk: "$jdk",
+  publisherStrategy: 'EXPLICIT',
+  globalMavenSettingsConfig: settingsName,
+  options: [junitPublisher(disabled: false)],
+  mavenOpts: mavenOpts,
+  mavenLocalRepo: localRepo) {
+// Some common Maven command line + provided command line
+sh "mvn -V -B -DfailIfNoTests=false -Dmaven.test.failure.ignore=true 
$cmdline"
+  }
+}

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

[tomcat-taglibs-parent] 14/18: fix more names

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 31a9f2177e60a583898c6ce5cfce05232f51306b
Author: olivier lamy 
AuthorDate: Fri Apr 10 10:57:15 2020 +1000

fix more names

Signed-off-by: olivier lamy 
---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0fb0afd..8b26b5a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
 stage( "Parallel Stage" ) {
   parallel {
 stage( "Build / Test - JDK8" ) {
-  agent { node { label 'ubuntu' } }
+  agent { node { label 'linux' } }
   options { timeout( time: 120, unit: 'MINUTES' ) }
   steps {
 mavenBuild( "JDK 1.8 (latest)", "clean install" )
@@ -23,7 +23,7 @@ pipeline {
   }
 }
 stage( "Build / Test - JDK11" ) {
-  agent { node { label 'ubuntu' } }
+  agent { node { label 'linux' } }
   options { timeout( time: 120, unit: 'MINUTES' ) }
   steps {
 mavenBuild( "JDK 11 (latest)", "clean install" )
@@ -46,7 +46,7 @@ pipeline {
  * @return the Jenkinsfile step representing a maven build
  */
 def mavenBuild(jdk, cmdline) {
-  def mvnName = 'maven3'
+  def mvnName = 'Maven 3.6.3'
   //def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" // 
".repository" //
   //def settingsName = 'oss-settings.xml'
   def mavenOpts = '-Xms2g -Xmx2g -Djava.awt.headless=true'

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

[tomcat-taglibs-parent] 12/18: fix typo

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 174889109b26534ba105c9e800cdc42e39d4fa50
Author: olivier lamy 
AuthorDate: Fri Apr 10 09:43:05 2020 +1000

fix typo

Signed-off-by: olivier lamy 
---
 Jenkinsfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e2b35ee..0bd3ab7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,10 +55,9 @@ def mavenBuild(jdk, cmdline) {
   maven: mvnName,
   jdk: "$jdk",
   publisherStrategy: 'EXPLICIT',
-  globalMavenSettingsConfig: settingsName,
+  //globalMavenSettingsConfig: settingsName,
   options: [junitPublisher(disabled: false)],
-  mavenOpts: mavenOpts,
-  mavenLocalRepo: localRepo) {
+  mavenOpts: mavenOpts) {
 // Some common Maven command line + provided command line
 sh "mvn -V -B -DfailIfNoTests=false -Dmaven.test.failure.ignore=true 
$cmdline"
   }

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

[tomcat-taglibs-parent] 15/18: fix node name

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 5461bd266a34bd75a9458901f72be7146eda01aa
Author: olivier lamy 
AuthorDate: Fri Apr 10 10:59:56 2020 +1000

fix node name

Signed-off-by: olivier lamy 
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8b26b5a..dc0a883 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
 stage( "Parallel Stage" ) {
   parallel {
 stage( "Build / Test - JDK8" ) {
-  agent { node { label 'linux' } }
+  agent { node { label 'ubuntu' } }
   options { timeout( time: 120, unit: 'MINUTES' ) }
   steps {
 mavenBuild( "JDK 1.8 (latest)", "clean install" )
@@ -23,7 +23,7 @@ pipeline {
   }
 }
 stage( "Build / Test - JDK11" ) {
-  agent { node { label 'linux' } }
+  agent { node { label 'ubuntu' } }
   options { timeout( time: 120, unit: 'MINUTES' ) }
   steps {
 mavenBuild( "JDK 11 (latest)", "clean install" )

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

[tomcat-taglibs-parent] 04/18: upgrade some plugin version

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 24ac5f2fa89b5cb04de18970698688e49a7ee1d4
Author: Olivier Lamy 
AuthorDate: Mon Jun 24 12:14:32 2013 +

upgrade some plugin version
---
 pom.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7589949..1d16a66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache
 apache
-10
+13
   
 
   org.apache.taglibs
@@ -104,7 +104,7 @@
 
   org.apache.maven.plugins
   maven-compiler-plugin
-  2.5.1
+  3.1
   
 ${maven.compiler.source}
 ${maven.compiler.target}
@@ -114,12 +114,12 @@
 
   org.apache.maven.plugins
   maven-surefire-plugin
-  2.12.4
+  2.15
 
 
   org.apache.maven.plugins
   maven-site-plugin
-  3.1
+  3.3
 
   
 
@@ -128,7 +128,7 @@
   
 org.apache.felix
 maven-bundle-plugin
-2.0.1
+2.4.0
 true
 
   
@@ -146,7 +146,7 @@
   
 org.apache.maven.plugins
 maven-javadoc-plugin
-2.8.1
+2.9
 
   true
   
@@ -157,7 +157,7 @@
   
 org.apache.maven.plugins
 maven-changes-plugin
-2.3
+2.9
 
   
 
@@ -169,17 +169,17 @@
   
 org.apache.maven.plugins
 maven-jxr-plugin
-2.2
+2.3
 
   
 org.apache.maven.plugins
 maven-project-info-reports-plugin
-2.4
+2.7
   
   
 org.apache.maven.plugins
 maven-surefire-report-plugin
-2.12
+2.15
 
 
   

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

[tomcat-taglibs-parent] 05/18: Update copyright year and text

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 5dc9dfdd1fedaa7db572d6de2ce89c04e97e
Author: Jeremy Boynes 
AuthorDate: Fri Aug 9 06:25:34 2013 +

Update copyright year and text
---
 NOTICE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NOTICE b/NOTICE
index d53bd35..7c884dc 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Tomcat Taglib Parent
-Copyright 2000-2012 The Apache Software Foundation
+Copyright 2000-2013 The Apache Software Foundation
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

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

[tomcat-taglibs-parent] 03/18: remove wrong jenkins url

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 7a00d199728b48cbaa5b56a3c6c5d10803f4b881
Author: Olivier Lamy 
AuthorDate: Mon Jun 24 12:09:30 2013 +

remove wrong jenkins url
---
 pom.xml | 5 -
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52846b8..7589949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,6 @@
 UTF-8
   
 
-  
-jenkins
-https://builds.apache.org/view/S-Z/view/Tomcat/job/Taglibs-All/
-  
-
   
 bugzilla
 http://issues.apache.org/bugzilla/

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

[tomcat-taglibs-parent] 06/18: Happy new 2014!

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 85d19059548b5810b3fd16bb10b373f508757191
Author: Rainer Jung 
AuthorDate: Fri Jan 3 18:08:32 2014 +

Happy new 2014!
---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index 7c884dc..0519fd1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Tomcat Taglib Parent
-Copyright 2000-2013 The Apache Software Foundation
+Copyright 2000-2014 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

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

[tomcat-taglibs-parent] 07/18: Happy New Year 2015

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 2370d81c94453cc8ec3ef8ae18f61dba8a45659a
Author: Rainer Jung 
AuthorDate: Thu Jan 1 11:34:23 2015 +

Happy New Year 2015
---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index 0519fd1..b6bbd26 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Tomcat Taglib Parent
-Copyright 2000-2014 The Apache Software Foundation
+Copyright 2000-2015 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

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

[tomcat-taglibs-parent] 08/18: Happy New Year 2016

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit fab9de78f63718e9ea72abda4a4e9e5d96c1b03a
Author: Rainer Jung 
AuthorDate: Fri Jan 1 19:24:32 2016 +

Happy New Year 2016
---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index b6bbd26..c81d228 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Tomcat Taglib Parent
-Copyright 2000-2015 The Apache Software Foundation
+Copyright 2000-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

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

[tomcat-taglibs-parent] 16/18: add basic .gitignore

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 2cf8474dbc5053aac89b3a21af116368a583adac
Author: olivier lamy 
AuthorDate: Fri Apr 10 11:42:15 2020 +1000

add basic .gitignore

Signed-off-by: olivier lamy 
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..ffac74e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+target/
+*.iml

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

[tomcat-taglibs-parent] 01/18: [maven-release-plugin] prepare for next development iteration

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 7ea7c70fff472610cd65847830dd1f36216445b7
Author: Jeremy Boynes 
AuthorDate: Mon Mar 26 04:54:46 2012 +

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a5865cd..23c757e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
   org.apache.taglibs
   taglibs-parent
-  3
+  4-SNAPSHOT
   Apache Taglibs Parent
   pom
 
@@ -52,9 +52,9 @@
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3
-
scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3
-
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3
+
scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk
+
scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk
+http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk
   
 
   

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

[tomcat-taglibs-parent] 02/18: use last version of maven plugins

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git

commit 0f7e067a36180f83598a4c4cc9b34da063aacee8
Author: Olivier Lamy 
AuthorDate: Mon Oct 1 13:20:35 2012 +

use last version of maven plugins
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 23c757e..52846b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
 
   org.apache.maven.plugins
   maven-compiler-plugin
-  2.3.2
+  2.5.1
   
 ${maven.compiler.source}
 ${maven.compiler.target}
@@ -119,12 +119,12 @@
 
   org.apache.maven.plugins
   maven-surefire-plugin
-  2.12
+  2.12.4
 
 
   org.apache.maven.plugins
   maven-site-plugin
-  3.0
+  3.1
 
   
 

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

[tomcat-taglibs-parent] branch main created (now 5c359d0)

[markt]

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

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-parent.git.


  at 5c359d0  simplify Jenkinsfile

This branch includes the following new commits:

 new 7ea7c70  [maven-release-plugin] prepare for next development iteration
 new 0f7e067  use last version of maven plugins
 new 7a00d19  remove wrong jenkins url
 new 24ac5f2  upgrade some plugin version
 new 5dc9dfd  Update copyright year and text
 new 85d1905  Happy new 2014!
 new 2370d81  Happy New Year 2015
 new fab9de7  Happy New Year 2016
 new 6754659  Happy New Year 2017
 new 48c6066  upgrade some maven plugins, jdk target is now 8
 new c83b7e5  add Jenkinsfile
 new 1748891  fix typo
 new 8d57248  fix jdk names
 new 31a9f21  fix more names
 new 5461bd2  fix node name
 new 2cf8474  add basic .gitignore
 new e786aea  reformat pom and fix scm information
 new 5c359d0  simplify Jenkinsfile

The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

svn commit: r1890083 - in /tomcat/site/trunk: docs/source.html xdocs/source.xml

[markt]

Author: markt
Date: Fri May 21 20:09:45 2021
New Revision: 1890083

URL: http://svn.apache.org/viewvc?rev=1890083=rev
Log:
Update after branch rename to main

Modified:
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/xdocs/source.xml

Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1890083=1890082=1890083=diff
==
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Fri May 21 20:09:45 2021
@@ -85,9 +85,9 @@ first.
 This is the Git repository that contains the Apache Tomcat training material
 source code. There is currently one active branch:
 
-master
+main
 
-master is the primary development branch. Apache Tomcat training courses are
+main is the primary development branch. Apache Tomcat training courses are
 tagged from this branch. Development work generally occurs in this branch
 first.
 A web based view of this repository is available via

Modified: tomcat/site/trunk/xdocs/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1890083=1890082=1890083=diff
==
--- tomcat/site/trunk/xdocs/source.xml (original)
+++ tomcat/site/trunk/xdocs/source.xml Fri May 21 20:09:45 2021
@@ -103,9 +103,9 @@ first.
 This is the Git repository that contains the Apache Tomcat training material
 source code. There is currently one active branch:
 
-master
+main
 
-master is the primary development branch. Apache Tomcat training courses are
+main is the primary development branch. Apache Tomcat training courses are
 tagged from this branch. Development work generally occurs in this branch
 first.
 A web based view of this repository is available via



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

[tomcat-training] branch main created (now 0e66341)

[markt]

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

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


  at 0e66341  First pass at ApacheCon 2020 updates

No new revisions were added by this update.

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

Re: [NOTICE] Branch renaming starting shortly

[Mark Thomas]

On 21/05/2021 20:55, Mark Thomas wrote:

I'll post to this thread as I complete each repo.

After migration, everyone with a local clone will need to run this from 
the root of each clone:


git branch -m master main
git fetch origin
git branch -u origin/main main


Note you may also want to call
git remote prune origin

Completed https://github.com/apache/tomcat-jakartaee-migration

Mark

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

svn commit: r1890082 - in /tomcat/site/trunk: docs/oldnews.html xdocs/oldnews.xml

[markt]

Author: markt
Date: Fri May 21 20:05:48 2021
New Revision: 1890082

URL: http://svn.apache.org/viewvc?rev=1890082=rev
Log:
Update after branch rename to main

Modified:
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1890082=1890081=1890082=diff
==
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Fri May 21 20:05:48 2021
@@ -196,7 +196,7 @@ bug fixes and improvements compared to v
 
 
 Full details of these changes, and all the other changes, are available in the
-https://github.com/apache/tomcat-jakartaee-migration/blob/master/CHANGES.md;>changelog.
+https://github.com/apache/tomcat-jakartaee-migration/blob/main/CHANGES.md;>changelog.
 
 
 

Modified: tomcat/site/trunk/xdocs/oldnews.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=1890082=1890081=1890082=diff
==
--- tomcat/site/trunk/xdocs/oldnews.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews.xml Fri May 21 20:05:48 2021
@@ -219,7 +219,7 @@ bug fixes and improvements compared to v
 
 
 Full details of these changes, and all the other changes, are available in the
-https://github.com/apache/tomcat-jakartaee-migration/blob/master/CHANGES.md;>changelog.
+https://github.com/apache/tomcat-jakartaee-migration/blob/main/CHANGES.md;>changelog.
 
 
 



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

[tomcat-jakartaee-migration] branch main updated: Update after branch rename to main

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 5fd32ac  Update after branch rename to main
5fd32ac is described below

commit 5fd32acc5aa534e3eb6587d397adf037e4dcf798
Author: Mark Thomas 
AuthorDate: Fri May 21 21:00:43 2021 +0100

Update after branch rename to main
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9ccbff2..efc6450 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 
 [![Build 
Status](https://secure.travis-ci.org/apache/tomcat-jakartaee-migration.svg)](http://travis-ci.org/apache/tomcat-jakartaee-migration)
-[![Coverage 
Status](https://coveralls.io/repos/github/apache/tomcat-jakartaee-migration/badge.svg?branch=master)](https://coveralls.io/github/apache/tomcat-jakartaee-migration?branch=master)
+[![Coverage 
Status](https://coveralls.io/repos/github/apache/tomcat-jakartaee-migration/badge.svg?branch=main)](https://coveralls.io/github/apache/tomcat-jakartaee-migration?branch=main)
 
[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 
 ## Overview
@@ -63,7 +63,7 @@ The migration tool is available as an Ant task, here is an 
example:
 ## Differences between Java EE 8 and Jakarta EE 9
 
 The difference between Java EE 8 and Jakarta EE 9 is that all the
-[Java EE 8 
packages](https://github.com/apache/tomcat-jakartaee-migration/blob/master/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java#L37)
+[Java EE 8 
packages](https://github.com/apache/tomcat-jakartaee-migration/blob/main/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java#L37)
 in the `javax.*` namespace have moved to the `jakarta.*` namespace.
 Some sub-packages have also been renamed. 
 This migration tool performs all the necessary changes to migrate an 
application

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

[tomcat-jakartaee-migration] branch main updated: Add support for .groovy files to the text converter

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 6465822  Add support for .groovy files to the text converter
6465822 is described below

commit 6465822873b3215cabc4a922e8444c4a960d7761
Author: Mark Thomas 
AuthorDate: Fri May 14 16:30:16 2021 +0100

Add support for .groovy files to the text converter
---
 CHANGES.md   | 1 +
 src/main/java/org/apache/tomcat/jakartaee/TextConverter.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 6e3beef..d3de81b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,7 @@
 # Tomcat Migration Tool for Jakarta EE - Changelog
 
 ## 1.0.1 (in progress)
+- Fix [#19](https://github.com/apache/tomcat-jakartaee-migration/issues/19). 
Add support for converting `.groovy` files.
 
 - Fix [#20](https://github.com/apache/tomcat-jakartaee-migration/issues/20) by 
using commons-compression instead of the Java zip code (remm)
 - Remove deprecated `-verbose` command line option (remm)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
index b3c7857..80036ba 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
@@ -45,6 +45,7 @@ public class TextConverter implements Converter {
 supportedExtensions.add("xml");
 supportedExtensions.add("json");
 supportedExtensions.add("properties");
+supportedExtensions.add("groovy");
 }
 
 

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

[tomcat-jakartaee-migration] 06/06: Fix handling of nested archives

[markt]

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

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

commit eabb165632163890a36db0c4369cda2dc7d9be9f
Author: remm 
AuthorDate: Thu May 20 11:43:20 2021 +0200

Fix handling of nested archives
---
 src/main/java/org/apache/tomcat/jakartaee/Migration.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 097c04e..f9a45c0 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -40,6 +40,8 @@ import 
org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.CloseShieldInputStream;
+import org.apache.commons.io.output.CloseShieldOutputStream;
 
 public class Migration {
 
@@ -209,8 +211,8 @@ public class Migration {
 
 
 private void migrateArchiveStreaming(String name, InputStream src, 
OutputStream dest) throws IOException {
-try (ZipArchiveInputStream srcZipStream = new 
ZipArchiveInputStream(src);
-ZipArchiveOutputStream destZipStream = new 
ZipArchiveOutputStream(dest)) {
+try (ZipArchiveInputStream srcZipStream = new 
ZipArchiveInputStream(new CloseShieldInputStream(src));
+ZipArchiveOutputStream destZipStream = new 
ZipArchiveOutputStream(new CloseShieldOutputStream(dest))) {
 ZipArchiveEntry srcZipEntry;
 while ((srcZipEntry = srcZipStream.getNextZipEntry()) != null) {
 String srcName = srcZipEntry.getName();

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

[tomcat-jakartaee-migration] branch main created (now eabb165)

[markt]

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

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


  at eabb165  Fix handling of nested archives

This branch includes the following new commits:

 new 3eaae95  [maven-release-plugin] prepare for next development iteration
 new ecca93a  Further prep for next development cycle
 new 105e5b9  Use commons-compression for the default code path
 new 0bf8836  Add issue link
 new 528f05e  Remove deprecated -verbose option
 new eabb165  Fix handling of nested archives

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

[tomcat-jakartaee-migration] 05/06: Remove deprecated -verbose option

[markt]

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

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

commit 528f05e09ba5745c56bcd66e02d88ce7ad8bb596
Author: remm 
AuthorDate: Wed May 19 15:58:32 2021 +0200

Remove deprecated -verbose option
---
 CHANGES.md   |  1 +
 src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java  | 10 --
 src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java |  2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ad44c6c..6e3beef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 ## 1.0.1 (in progress)
 
 - Fix [#20](https://github.com/apache/tomcat-jakartaee-migration/issues/20) by 
using commons-compression instead of the Java zip code (remm)
+- Remove deprecated `-verbose` command line option (remm)
 
 ## 1.0.0
 
diff --git a/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java 
b/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
index 36e9dc5..1b7c92f 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
@@ -33,9 +33,6 @@ public class MigrationCLI {
 private static final String EXCLUDE_ARG = "-exclude=";
 private static final String LOGLEVEL_ARG = "-logLevel=";
 private static final String PROFILE_ARG = "-profile=";
-// Will be removed for 1.0.0
-@Deprecated
-private static final String VERBOSE_ARG = "-verbose";
 private static final String ZIPINMEMORY_ARG = "-zipInMemory";
 
 public static void main(String[] args) throws IOException {
@@ -81,13 +78,6 @@ public class MigrationCLI {
 } else if (argument.equals(ZIPINMEMORY_ARG)) {
 iter.remove();
 migration.setZipInMemory(true);
-} else if (argument.equals(VERBOSE_ARG)) {
-iter.remove();
-// Ignore if LOGLEVEL_ARG has set something different
-if 
(Logger.getGlobal().getParent().getLevel().equals(Level.INFO)) {
-
Logger.getGlobal().getParent().getHandlers()[0].setLevel(Level.FINE);
-Logger.getGlobal().getParent().setLevel(Level.FINE);
-}
 }
 }
 
diff --git a/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java 
b/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
index e4384be..0d61442 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
@@ -57,7 +57,7 @@ public class MigrationTest {
 @Test
 public void testMigrateSingleSourceFileWithProfile() throws Exception {
 File migratedFile = new 
File("target/test-classes/HelloServlet.migrated.java");
-MigrationCLI.main(new String[] {"-verbose", "-profile=EE", 
"target/test-classes/HelloServlet.java", migratedFile.getAbsolutePath()});
+MigrationCLI.main(new String[] {"-logLevel=FINE", "-profile=EE", 
"target/test-classes/HelloServlet.java", migratedFile.getAbsolutePath()});
 
 assertTrue("Migrated file not found", migratedFile.exists());
 

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

[tomcat-jakartaee-migration] 04/06: Add issue link

[markt]

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

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

commit 0bf8836cde6a47c12a6270edd4b3300bd0126f5e
Author: remm 
AuthorDate: Wed May 19 15:52:57 2021 +0200

Add issue link
---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c7c1c95..ad44c6c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@
 
 ## 1.0.1 (in progress)
 
-- Fix [#20] by using commons-compression instead of the Java zip code (remm)
+- Fix [#20](https://github.com/apache/tomcat-jakartaee-migration/issues/20) by 
using commons-compression instead of the Java zip code (remm)
 
 ## 1.0.0
 

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

[tomcat-jakartaee-migration] 02/06: Further prep for next development cycle

[markt]

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

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

commit ecca93a20700302cf48861d452482dc9a2ea0c50
Author: Mark Thomas 
AuthorDate: Tue May 4 12:57:39 2021 +0100

Further prep for next development cycle
---
 CHANGES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index b38a8df..98be94f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,8 @@
 # Tomcat Migration Tool for Jakarta EE - Changelog
 
-## 1.0.0 (in progress)
+## 1.0.1 (in progress)
+
+## 1.0.0
 
 - Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14). 
Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov)
 - The class transformer will now validate that the target classes in the 
Jakarta namespace exist in the runtime environment (remm)

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

[tomcat-jakartaee-migration] 01/06: [maven-release-plugin] prepare for next development iteration

[markt]

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

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

commit 3eaae95329d9862d166f9fa43335ae76eec86508
Author: Mark Thomas 
AuthorDate: Tue May 4 12:50:14 2021 +0100

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2100ca1..ba299fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   org.apache.tomcat
   jakartaee-migration
   Apache Tomcat Migration Tool for Jakarta EE
-  1.0.0
+  1.0.1-SNAPSHOT
  
   
 This tool is a work in progress.
@@ -103,7 +103,7 @@
 
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
 
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
 
https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git
-1.0.0
+HEAD
   
 
   

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

[tomcat-jakartaee-migration] 03/06: Use commons-compression for the default code path

[markt]

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

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

commit 105e5b97c6aa274b95332697338a7c535415ad77
Author: remm 
AuthorDate: Wed May 19 15:50:05 2021 +0200

Use commons-compression for the default code path

The JVM code has too much exception throwing and hardcoded behavior
given what the migration tool does, as seen in issue #20. The
commons-compression code does not seem to have the same check in that
case, as seen when using -zipInMemory (it does not do anything special
yet does not complain about duplicate entries since there's no check for
that in the code).
In some cases, this seems faster. In others not so much. This needs more
investigation to verify there's no regression in that area (or anywhere
else).
---
 CHANGES.md |  2 ++
 .../org/apache/tomcat/jakartaee/Migration.java | 34 +-
 .../tomcat/jakartaee/LocalStrings.properties   |  1 -
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 98be94f..c7c1c95 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,8 @@
 
 ## 1.0.1 (in progress)
 
+- Fix [#20] by using commons-compression instead of the Java zip code (remm)
+
 ## 1.0.0
 
 - Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14). 
Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 59d4600..097c04e 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -30,21 +30,16 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import java.util.jar.JarEntry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.input.CloseShieldInputStream;
-import org.apache.commons.io.output.CloseShieldOutputStream;
 
 public class Migration {
 
@@ -214,23 +209,22 @@ public class Migration {
 
 
 private void migrateArchiveStreaming(String name, InputStream src, 
OutputStream dest) throws IOException {
-try (ZipInputStream zipIs = new ZipInputStream(new 
CloseShieldInputStream(src));
-ZipOutputStream zipOs = new ZipOutputStream(new 
CloseShieldOutputStream(dest))) {
-ZipEntry zipEntry;
-while ((zipEntry = zipIs.getNextEntry()) != null) {
-String sourceName = zipEntry.getName();
-if (isSignatureFile(sourceName)) {
-logger.log(Level.WARNING, 
sm.getString("migration.skipSignatureFile", sourceName));
+try (ZipArchiveInputStream srcZipStream = new 
ZipArchiveInputStream(src);
+ZipArchiveOutputStream destZipStream = new 
ZipArchiveOutputStream(dest)) {
+ZipArchiveEntry srcZipEntry;
+while ((srcZipEntry = srcZipStream.getNextZipEntry()) != null) {
+String srcName = srcZipEntry.getName();
+if (isSignatureFile(srcName)) {
+logger.log(Level.WARNING, 
sm.getString("migration.skipSignatureFile", srcName));
 continue;
 }
-String destName = profile.convert(sourceName);
-JarEntry destEntry = new JarEntry(destName);
-zipOs.putNextEntry(destEntry);
-migrateStream(sourceName, zipIs, zipOs);
+String destName = profile.convert(srcName);
+RenamableZipArchiveEntry destZipEntry = new 
RenamableZipArchiveEntry(srcZipEntry);
+destZipEntry.setName(destName);
+destZipStream.putArchiveEntry(destZipEntry);
+migrateStream(srcName, srcZipStream, destZipStream);
+destZipStream.closeArchiveEntry();
 }
-} catch (ZipException ze) {
-logger.log(Level.SEVERE, sm.getString("migration.archiveFailed", 
name), ze);
-throw ze;
 }
 }
 
diff --git 
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties 
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index 54fa2fe..4aecca9 100644
--- 

[NOTICE] Branch renaming starting shortly

[Mark Thomas]

I'll post to this thread as I complete each repo.

After migration, everyone with a local clone will need to run this from 
the root of each clone:


git branch -m master main
git fetch origin
git branch -u origin/main main

Mark

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

buildbot success in on tomcat-85-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2735

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 523dfdb7fdeada2257eb9f236081ab735426bc87
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

buildbot success in on tomcat-9-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/774

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 4a224a7b14b093c27a83bb32056385ea205af4a1
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] 01/02: Refactor to simplify code. Also improve code coverage

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 94f166631b6e424c8926442e7b5375e1f3ca86e6
Author: Mark Thomas 
AuthorDate: Thu May 24 22:17:11 2018 +

Refactor to simplify code. Also improve code coverage
---
 .../tomcat/util/http/parser/Authorization.java | 71 +-
 .../util/http/parser/LocalStrings.properties   |  2 -
 .../util/http/parser/TestAuthorizationDigest.java  | 28 -
 3 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/Authorization.java 
b/java/org/apache/tomcat/util/http/parser/Authorization.java
index a61b4f0..443fcc5 100644
--- a/java/org/apache/tomcat/util/http/parser/Authorization.java
+++ b/java/org/apache/tomcat/util/http/parser/Authorization.java
@@ -22,43 +22,32 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.tomcat.util.res.StringManager;
-
 /**
  * Parser for an "Authorization" header.
  */
 public class Authorization {
 
-private static final StringManager sm = 
StringManager.getManager(Authorization.class);
-
-@SuppressWarnings("unused")  // Unused due to buggy client implementations
-private static final Integer FIELD_TYPE_TOKEN = Integer.valueOf(0);
-private static final Integer FIELD_TYPE_QUOTED_STRING = Integer.valueOf(1);
-private static final Integer FIELD_TYPE_TOKEN_OR_QUOTED_STRING = 
Integer.valueOf(2);
-private static final Integer FIELD_TYPE_LHEX = Integer.valueOf(3);
-private static final Integer FIELD_TYPE_QUOTED_TOKEN = Integer.valueOf(4);
-
-private static final Map fieldTypes = new HashMap<>();
+private static final Map fieldTypes = new HashMap<>();
 
 static {
 // Digest field types.
 // Note: These are more relaxed than RFC2617. This adheres to the
 //   recommendation of RFC2616 that servers are tolerant of buggy
 //   clients when they can be so without ambiguity.
-fieldTypes.put("username", FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put("realm", FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put("nonce", FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put("digest-uri", FIELD_TYPE_QUOTED_STRING);
+fieldTypes.put("username", FieldType.QUOTED_STRING);
+fieldTypes.put("realm", FieldType.QUOTED_STRING);
+fieldTypes.put("nonce", FieldType.QUOTED_STRING);
+fieldTypes.put("digest-uri", FieldType.QUOTED_STRING);
 // RFC2617 says response is <">32LHEX<">. 32LHEX will also be accepted
-fieldTypes.put("response", FIELD_TYPE_LHEX);
+fieldTypes.put("response", FieldType.LHEX);
 // RFC2617 says algorithm is token. <">token<"> will also be accepted
-fieldTypes.put("algorithm", FIELD_TYPE_QUOTED_TOKEN);
-fieldTypes.put("cnonce", FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put("opaque", FIELD_TYPE_QUOTED_STRING);
+fieldTypes.put("algorithm", FieldType.QUOTED_TOKEN);
+fieldTypes.put("cnonce", FieldType.QUOTED_STRING);
+fieldTypes.put("opaque", FieldType.QUOTED_STRING);
 // RFC2617 says qop is token. <">token<"> will also be accepted
-fieldTypes.put("qop", FIELD_TYPE_QUOTED_TOKEN);
+fieldTypes.put("qop", FieldType.QUOTED_TOKEN);
 // RFC2617 says nc is 8LHEX. <">8LHEX<"> will also be accepted
-fieldTypes.put("nc", FIELD_TYPE_LHEX);
+fieldTypes.put("nc", FieldType.LHEX);
 
 }
 
@@ -94,37 +83,25 @@ public class Authorization {
 if (HttpParser.skipConstant(input, "=") != SkipResult.FOUND) {
 return null;
 }
-String value;
-Integer type = fieldTypes.get(field.toLowerCase(Locale.ENGLISH));
+String value = null;
+FieldType type = fieldTypes.get(field.toLowerCase(Locale.ENGLISH));
 if (type == null) {
 // auth-param = token "=" ( token | quoted-string )
-type = FIELD_TYPE_TOKEN_OR_QUOTED_STRING;
+type = FieldType.TOKEN_OR_QUOTED_STRING;
 }
-switch (type.intValue()) {
-case 0:
-// FIELD_TYPE_TOKEN
-value = HttpParser.readToken(input);
-break;
-case 1:
-// FIELD_TYPE_QUOTED_STRING
+switch (type) {
+case QUOTED_STRING:
 value = HttpParser.readQuotedString(input, false);
 break;
-case 2:
-// FIELD_TYPE_TOKEN_OR_QUOTED_STRING
+case TOKEN_OR_QUOTED_STRING:
 value = HttpParser.readTokenOrQuotedString(input, false);
 break;
-case 3:
-// FIELD_TYPE_LHEX
+case LHEX:
 value = 

[tomcat] 02/02: Align with 10.0.x/9.0.x

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7d71bfad38c5623a74b7c90ffdc91e20888c60b8
Author: Mark Thomas 
AuthorDate: Fri May 21 17:03:00 2021 +0100

Align with 10.0.x/9.0.x
---
 .../tomcat/util/http/parser/Authorization.java |  6 
 .../util/http/parser/TestAuthorizationDigest.java  | 36 +++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/Authorization.java 
b/java/org/apache/tomcat/util/http/parser/Authorization.java
index 443fcc5..8afba9b 100644
--- a/java/org/apache/tomcat/util/http/parser/Authorization.java
+++ b/java/org/apache/tomcat/util/http/parser/Authorization.java
@@ -51,6 +51,12 @@ public class Authorization {
 
 }
 
+
+private Authorization() {
+// Utility class. Hide default constructor.
+}
+
+
 /**
  * Parses an HTTP Authorization header for DIGEST authentication as per RFC
  * 2617 section 3.2.2.
diff --git 
a/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java 
b/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
index b7787e9..9436f33 100644
--- a/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
+++ b/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
@@ -318,6 +318,16 @@ public class TestAuthorizationDigest {
 }
 
 @Test
+public void testEmptyQop() throws Exception {
+String header = "Digest qop=";
+
+StringReader input = new StringReader(header);
+
+Map result = 
Authorization.parseAuthorizationDigest(input);
+Assert.assertNull(result);
+}
+
+@Test
 public void testEmptyQuotedTokenQop() throws Exception {
 String header = "Digest qop=\"\"";
 
@@ -472,8 +482,20 @@ public class TestAuthorizationDigest {
 }
 
 @Test
-public void testNotDigest() throws Exception {
-String header = "SomethingElse a=b";
+public void testParseAuthParamBEscaped() throws Exception {
+// Test for HttpParser.readTokenOrQuotedString()
+// auth-param = token "=" ( token | quoted-string )
+String header = "Digest a=\"b\\\"b\"";
+
+StringReader input = new StringReader(header);
+
+Map result = 
Authorization.parseAuthorizationDigest(input);
+Assert.assertEquals("b\"b", result.get("a"));
+}
+
+@Test
+public void testQuotedStringNoQuotes() throws Exception {
+String header = "Digest username=a";
 
 StringReader input = new StringReader(header);
 
@@ -482,8 +504,12 @@ public class TestAuthorizationDigest {
 }
 
 @Test
-public void testCoverage() {
-// Here to add code coverage of default constructor
-Assert.assertNotNull(new Authorization());
+public void testNotDigest() throws Exception {
+String header = "SomethingElse a=b";
+
+StringReader input = new StringReader(header);
+
+Map result = 
Authorization.parseAuthorizationDigest(input);
+Assert.assertNull(result);
 }
 }

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

[tomcat] branch 8.5.x updated (523dfdb -> 7d71bfa)

[markt]

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

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 523dfdb  Additional changes for BZ 62912 backport
 new 94f1666  Refactor to simplify code. Also improve code coverage
 new 7d71bfa  Align with 10.0.x/9.0.x

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../tomcat/util/http/parser/Authorization.java | 77 ++
 .../util/http/parser/LocalStrings.properties   |  2 -
 .../util/http/parser/TestAuthorizationDigest.java  | 54 ++-
 3 files changed, 88 insertions(+), 45 deletions(-)

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

[tomcat] branch 9.0.x updated: Align with 10.0.x/8.5.x

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 11256a5  Align with 10.0.x/8.5.x
11256a5 is described below

commit 11256a53e976d15d9b536774919a2d3c57ce9cc8
Author: Mark Thomas 
AuthorDate: Fri May 21 17:02:34 2021 +0100

Align with 10.0.x/8.5.x
---
 test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java 
b/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
index c7d86b9..9436f33 100644
--- a/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
+++ b/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
@@ -512,6 +512,4 @@ public class TestAuthorizationDigest {
 Map result = 
Authorization.parseAuthorizationDigest(input);
 Assert.assertNull(result);
 }
-
-
 }

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

[tomcat] branch master updated: Align with 9.0.x/8.5.x

[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 8e2aa5e  Align with 9.0.x/8.5.x
8e2aa5e is described below

commit 8e2aa5e45ce13388da62386e3cb1dbfa3b242b4b
Author: Mark Thomas 
AuthorDate: Fri May 21 17:02:00 2021 +0100

Align with 9.0.x/8.5.x
---
 test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java 
b/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
index c7d86b9..9436f33 100644
--- a/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
+++ b/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
@@ -512,6 +512,4 @@ public class TestAuthorizationDigest {
 Map result = 
Authorization.parseAuthorizationDigest(input);
 Assert.assertNull(result);
 }
-
-
 }

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

[tomcat] branch 9.0.x updated: Add support for Unix Domain Sockets (APR Protocol)

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 6d16a58  Add support for Unix Domain Sockets (APR Protocol)
6d16a58 is described below

commit 6d16a5825ea7522ae448e29d6c2c74bc06a05197
Author: minfrin 
AuthorDate: Mon Feb 1 14:36:49 2021 +

Add support for Unix Domain Sockets (APR Protocol)

Add support and test case for Unix Domain Sockets in
org.apache.coyote.http11.Http11AprProtocol, to support
users using Java versions older than 16.

Requires tomcat-native 1.2.26 and above.

Backport of the following:


https://github.com/apache/tomcat/commit/c400239cb17d82f8e10f12e40881293b7d2d70b9

https://github.com/apache/tomcat/commit/a616bf385a350175a33a0ebf09d8b6688344e9e3
---
 .../apache/catalina/core/AprLifecycleListener.java |   3 +-
 .../apache/catalina/core/LocalStrings.properties   |   2 +-
 .../catalina/core/LocalStrings_es.properties   |   2 +-
 .../catalina/core/LocalStrings_fr.properties   |   2 +-
 .../catalina/core/LocalStrings_ja.properties   |   2 +-
 .../catalina/core/LocalStrings_ko.properties   |   2 +-
 .../catalina/core/LocalStrings_zh_CN.properties|   2 +-
 java/org/apache/tomcat/jni/Address.java|   5 +-
 java/org/apache/tomcat/jni/Library.java|   8 ++
 java/org/apache/tomcat/jni/Socket.java |   1 +
 java/org/apache/tomcat/util/net/AprEndpoint.java   | 118 -
 .../apache/tomcat/util/net/LocalStrings.properties |   1 +
 webapps/docs/changelog.xml |   5 +
 webapps/docs/config/http.xml   |  43 ++--
 14 files changed, 154 insertions(+), 42 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 9dd2e93..51c8308 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -247,7 +247,8 @@ public class AprLifecycleListener
 Boolean.valueOf(Library.APR_HAVE_IPV6),
 Boolean.valueOf(Library.APR_HAS_SENDFILE),
 Boolean.valueOf(Library.APR_HAS_SO_ACCEPTFILTER),
-Boolean.valueOf(Library.APR_HAS_RANDOM)));
+Boolean.valueOf(Library.APR_HAS_RANDOM),
+Boolean.valueOf(Library.APR_HAVE_UNIX)));
 
 initInfoLogMessages.add(sm.getString("aprListener.config",
 Boolean.valueOf(AprStatus.getUseAprConnector()),
diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index 3b45537..2011e68 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -75,7 +75,7 @@ aprListener.aprInitError=The Apache Tomcat Native library 
failed to load. The er
 aprListener.config=APR/OpenSSL configuration: useAprConnector [{0}], 
useOpenSSL [{1}]
 aprListener.currentFIPSMode=Current FIPS mode: [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force 
entering FIPS mode, but library is already in FIPS mode [{0}]
-aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters 
[{2}], random [{3}].
+aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters 
[{2}], random [{3}], UDS [{4}].
 aprListener.initializeFIPSFailed=Failed to enter FIPS mode
 aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
 aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties 
b/java/org/apache/catalina/core/LocalStrings_es.properties
index c6604d7..89d247d 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -55,7 +55,7 @@ applicationServletRegistration.setServletSecurity.ise=No se 
pueden añadir restr
 
 aprListener.aprDestroy=No pude apagar la biblioteca nativa de Apache Tomcat
 aprListener.aprInit=La biblioteca nativa de Apache Tomcat basada en ARP que 
permite un rendimiento óptimo en entornos de desarrollo no ha sido hallada en 
java.library.path: [{0}]
-aprListener.flags=Capacidades APR: IPv6 [{0}], enviar fichero [{1}], aceptar 
filtros [{2}], aleatorio [{3}].
+aprListener.flags=Capacidades APR: IPv6 [{0}], enviar fichero [{1}], aceptar 
filtros [{2}], aleatorio [{3}], UDS [{4}].
 aprListener.initializedOpenSSL=OpenSSL inicializado correctamente [{0}]
 aprListener.initializingFIPS=Inicializando modo FIPS...
 aprListener.sslInit=No pude inicializar el SSLEngine (Motor SSL)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 8d341fe..daa194e 

[GitHub] [tomcat] markt-asf closed pull request #402: Add support for Unix Domain Sockets (APR Protocol)

[GitBox]

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


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on pull request #402: Add support for Unix Domain Sockets (APR Protocol)

[GitBox]

markt-asf commented on pull request #402:
URL: https://github.com/apache/tomcat/pull/402#issuecomment-846043401


   Merged manually so I could add the change log entry to the correct version.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch 8.5.x updated: Additional changes for BZ 62912 backport

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 523dfdb  Additional changes for BZ 62912 backport
523dfdb is described below

commit 523dfdb7fdeada2257eb9f236081ab735426bc87
Author: Mark Thomas 
AuthorDate: Fri May 21 16:20:03 2021 +0100

Additional changes for BZ 62912 backport
---
 java/org/apache/tomcat/util/http/parser/MediaType.java |  4 
 test/org/apache/tomcat/util/http/parser/TestMediaType.java | 12 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/MediaType.java 
b/java/org/apache/tomcat/util/http/parser/MediaType.java
index 2c548c0..52203cf 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -103,10 +103,6 @@ public class MediaType {
 continue;
 }
 result.append(';');
-// Workaround for Adobe Read 9 plug-in on IE bug
-// Can be removed after 26 June 2013 (EOL of Reader 9)
-// See BZ 53814
-result.append(' ');
 result.append(entry.getKey());
 result.append('=');
 result.append(entry.getValue());
diff --git a/test/org/apache/tomcat/util/http/parser/TestMediaType.java 
b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
index 9c0a7fa..31391f2 100644
--- a/test/org/apache/tomcat/util/http/parser/TestMediaType.java
+++ b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
@@ -134,9 +134,9 @@ public class TestMediaType {
 StringReader sr = new StringReader(sb.toString());
 MediaType m = MediaType.parseMediaType(sr);
 
-Assert.assertEquals("foo/bar; charset=UTF-8; a=b", m.toString());
+Assert.assertEquals("foo/bar;charset=UTF-8;a=b", m.toString());
 Assert.assertEquals(CHARSET, m.getCharset());
-Assert.assertEquals("foo/bar; a=b", m.toStringNoCharset());
+Assert.assertEquals("foo/bar;a=b", m.toStringNoCharset());
 }
 
 
@@ -176,8 +176,8 @@ public class TestMediaType {
 Assert.assertEquals("\"application/smil;charset=UTF-8\"",
 m.getParameterValue("Type"));
 
-String expected = "multipart/related; boundary=1_4F50BD36_CDF8C28; " +
-"start=\"<31671603.smil>\"; " +
+String expected = "multipart/related;boundary=1_4F50BD36_CDF8C28;" +
+"start=\"<31671603.smil>\";" +
 "type=\"application/smil;charset=UTF-8\"";
 Assert.assertEquals(expected, m.toString());
 Assert.assertEquals(expected, m.toStringNoCharset());
@@ -203,7 +203,7 @@ public class TestMediaType {
 Assert.assertEquals("UTF-8", m.getCharset());
 
 // Note: Invalid input is filtered out
-Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+Assert.assertEquals("text/html;charset=UTF-8", m.toString());
 Assert.assertEquals("UTF-8", m.getCharset());
 }
 
@@ -223,7 +223,7 @@ public class TestMediaType {
 Assert.assertEquals("UTF-8", m.getParameterValue("charset"));
 Assert.assertEquals("UTF-8", m.getCharset());
 
-Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+Assert.assertEquals("text/html;charset=UTF-8", m.toString());
 }
 
 

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

[tomcat] branch 9.0.x updated: Additional changes for BZ 62912 backport

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 4a224a7  Additional changes for BZ 62912 backport
4a224a7 is described below

commit 4a224a7b14b093c27a83bb32056385ea205af4a1
Author: Mark Thomas 
AuthorDate: Fri May 21 16:19:51 2021 +0100

Additional changes for BZ 62912 backport
---
 java/org/apache/tomcat/util/http/parser/MediaType.java |  4 
 test/org/apache/tomcat/util/http/parser/TestMediaType.java | 12 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/MediaType.java 
b/java/org/apache/tomcat/util/http/parser/MediaType.java
index 2c548c0..52203cf 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -103,10 +103,6 @@ public class MediaType {
 continue;
 }
 result.append(';');
-// Workaround for Adobe Read 9 plug-in on IE bug
-// Can be removed after 26 June 2013 (EOL of Reader 9)
-// See BZ 53814
-result.append(' ');
 result.append(entry.getKey());
 result.append('=');
 result.append(entry.getValue());
diff --git a/test/org/apache/tomcat/util/http/parser/TestMediaType.java 
b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
index 826de19..35a1d74 100644
--- a/test/org/apache/tomcat/util/http/parser/TestMediaType.java
+++ b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
@@ -142,9 +142,9 @@ public class TestMediaType {
 StringReader sr = new StringReader(sb.toString());
 MediaType m = MediaType.parseMediaType(sr);
 
-Assert.assertEquals("foo/bar; charset=UTF-8; a=b", m.toString());
+Assert.assertEquals("foo/bar;charset=UTF-8;a=b", m.toString());
 Assert.assertEquals(CHARSET, m.getCharset());
-Assert.assertEquals("foo/bar; a=b", m.toStringNoCharset());
+Assert.assertEquals("foo/bar;a=b", m.toStringNoCharset());
 }
 
 
@@ -184,8 +184,8 @@ public class TestMediaType {
 Assert.assertEquals("\"application/smil;charset=UTF-8\"",
 m.getParameterValue("Type"));
 
-String expected = "multipart/related; boundary=1_4F50BD36_CDF8C28; " +
-"start=\"<31671603.smil>\"; " +
+String expected = "multipart/related;boundary=1_4F50BD36_CDF8C28;" +
+"start=\"<31671603.smil>\";" +
 "type=\"application/smil;charset=UTF-8\"";
 Assert.assertEquals(expected, m.toString());
 Assert.assertEquals(expected, m.toStringNoCharset());
@@ -211,7 +211,7 @@ public class TestMediaType {
 Assert.assertEquals("UTF-8", m.getCharset());
 
 // Note: Invalid input is filtered out
-Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+Assert.assertEquals("text/html;charset=UTF-8", m.toString());
 Assert.assertEquals("UTF-8", m.getCharset());
 }
 
@@ -231,7 +231,7 @@ public class TestMediaType {
 Assert.assertEquals("UTF-8", m.getParameterValue("charset"));
 Assert.assertEquals("UTF-8", m.getCharset());
 
-Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+Assert.assertEquals("text/html;charset=UTF-8", m.toString());
 }
 
 

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

[tomcat] branch 8.5.x updated: Use StringManager. Align with 9.0.x/10.0.x

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new e9be1a3  Use StringManager. Align with 9.0.x/10.0.x
e9be1a3 is described below

commit e9be1a3a74a1a9080e4a2449f3af8f67f2e8d4e9
Author: Mark Thomas 
AuthorDate: Fri May 21 16:12:31 2021 +0100

Use StringManager. Align with 9.0.x/10.0.x
---
 java/org/apache/catalina/core/JniLifecycleListener.java | 12 +++-
 java/org/apache/catalina/core/LocalStrings.properties   |  5 +
 java/org/apache/catalina/core/LocalStrings_fr.properties|  5 +
 java/org/apache/catalina/core/LocalStrings_ja.properties|  5 +
 java/org/apache/catalina/core/LocalStrings_ko.properties|  5 +
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties |  5 +
 6 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/core/JniLifecycleListener.java 
b/java/org/apache/catalina/core/JniLifecycleListener.java
index fcc2967..0804d61 100644
--- a/java/org/apache/catalina/core/JniLifecycleListener.java
+++ b/java/org/apache/catalina/core/JniLifecycleListener.java
@@ -22,6 +22,7 @@ import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * An implementation of LifeCycleListener that loads a native library into the 
JVM.
@@ -38,6 +39,7 @@ import org.apache.juli.logging.LogFactory;
 public class JniLifecycleListener implements LifecycleListener {
 
 private static final Log log = 
LogFactory.getLog(JniLifecycleListener.class);
+protected static final StringManager sm = 
StringManager.getManager(Constants.Package);
 
 private String libraryName = "";
 private String libraryPath = "";
@@ -49,12 +51,12 @@ public class JniLifecycleListener implements 
LifecycleListener {
 
 if (!libraryName.isEmpty()) {
 System.loadLibrary(libraryName);
-log.info("Loaded native library " + libraryName);
+log.info(sm.getString("jniLifecycleListener.load.name", 
libraryName));
 } else if (!libraryPath.isEmpty()) {
 System.load(libraryPath);
-log.info("Loaded native library from " + libraryPath);
+log.info(sm.getString("jniLifecycleListener.load.path", 
libraryPath));
 } else {
-throw new IllegalArgumentException("Either libraryName or 
libraryPath must be set");
+throw new 
IllegalArgumentException(sm.getString("jniLifecycleListener.missingPathOrName"));
 }
 }
 }
@@ -62,7 +64,7 @@ public class JniLifecycleListener implements 
LifecycleListener {
 public void setLibraryName(String libraryName) {
 
 if (!this.libraryPath.isEmpty()) {
-throw new IllegalArgumentException("Either libraryName or 
libraryPath may be set, not both.");
+throw new 
IllegalArgumentException(sm.getString("jniLifecycleListener.bothPathAndName"));
 }
 
 this.libraryName = libraryName;
@@ -75,7 +77,7 @@ public class JniLifecycleListener implements 
LifecycleListener {
 public void setLibraryPath(String libraryPath) {
 
 if (!this.libraryName.isEmpty()) {
-throw new IllegalArgumentException("Either libraryName or 
libraryPath may be set, not both.");
+throw new 
IllegalArgumentException(sm.getString("jniLifecycleListener.bothPathAndName"));
 }
 
 this.libraryPath = libraryPath;
diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index 14fe743..d5c32cc 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -138,6 +138,11 @@ defaultInstanceManager.restrictedWrongValue=Wrong value in 
restricted classes pr
 filterChain.filter=Filter execution threw an exception
 filterChain.servlet=Servlet execution threw an exception
 
+jniLifecycleListener.bothPathAndName=Either libraryName or libraryPath may be 
set, not both
+jniLifecycleListener.load.name=Loaded native library [{0}]
+jniLifecycleListener.load.path=Loaded native library from [{0}]
+jniLifecycleListener.missingPathOrName=One of libraryName or libraryPath must 
be set
+
 jreLeakListener.authPolicyFail=Error whilst attempting to prevent memory leak 
in javax.security.auth.Policy class
 jreLeakListener.classToInitializeFail=Failed to load class [{0}] during Tomcat 
start to prevent possible memory leaks.
 jreLeakListener.gcDaemonFail=Failed to trigger creation of the GC Daemon 
thread during Tomcat start to prevent possible memory leaks. This is expected 
on non-Sun JVMs.
diff --git 

[tomcat] branch 8.5.x updated: Use StringManager. Align with 9.0.x/10.0.x

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new ef5cf5c  Use StringManager. Align with 9.0.x/10.0.x
ef5cf5c is described below

commit ef5cf5c8d4e6fafbb92e1ef55399a89783134d11
Author: Mark Thomas 
AuthorDate: Fri May 21 16:09:34 2021 +0100

Use StringManager. Align with 9.0.x/10.0.x
---
 java/org/apache/catalina/core/ContainerBase.java   | 28 +++---
 .../apache/catalina/core/LocalStrings.properties   |  9 +++
 .../catalina/core/LocalStrings_de.properties   |  1 +
 .../catalina/core/LocalStrings_fr.properties   |  9 +++
 .../catalina/core/LocalStrings_ja.properties   |  9 +++
 .../catalina/core/LocalStrings_ko.properties   |  9 +++
 .../catalina/core/LocalStrings_zh_CN.properties|  9 +++
 7 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/catalina/core/ContainerBase.java 
b/java/org/apache/catalina/core/ContainerBase.java
index 17c4ea9..ef5b53b 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -450,7 +450,7 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 try {
 ((Lifecycle) oldCluster).stop();
 } catch (LifecycleException e) {
-log.error("ContainerBase.setCluster: stop: ", e);
+log.error(sm.getString("containerBase.cluster.stop"), e);
 }
 }
 
@@ -463,7 +463,7 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 try {
 ((Lifecycle) cluster).start();
 } catch (LifecycleException e) {
-log.error("ContainerBase.setCluster: start: ", e);
+log.error(sm.getString("containerBase.cluster.start"), e);
 }
 }
 } finally {
@@ -664,7 +664,7 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 try {
 ((Lifecycle) oldRealm).stop();
 } catch (LifecycleException e) {
-log.error("ContainerBase.setRealm: stop: ", e);
+log.error(sm.getString("containerBase.realm.stop"), e);
 }
 }
 
@@ -676,7 +676,7 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 try {
 ((Lifecycle) realm).start();
 } catch (LifecycleException e) {
-log.error("ContainerBase.setRealm: start: ", e);
+log.error(sm.getString("containerBase.realm.start"), e);
 }
 }
 
@@ -722,13 +722,14 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 
 private void addChildInternal(Container child) {
 
-if( log.isDebugEnabled() )
+if (log.isDebugEnabled()) {
 log.debug("Add child " + child + " " + this);
+}
+
 synchronized(children) {
 if (children.get(child.getName()) != null)
-throw new IllegalArgumentException("addChild:  Child name '" +
-   child.getName() +
-   "' is not unique");
+throw new IllegalArgumentException(
+sm.getString("containerBase.child.notUnique", 
child.getName()));
 child.setParent(this);  // May throw IAE
 children.put(child.getName(), child);
 }
@@ -744,7 +745,7 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 }
 } catch (LifecycleException e) {
 log.error("ContainerBase.addChild: start: ", e);
-throw new IllegalStateException("ContainerBase.addChild: start: " 
+ e);
+throw new 
IllegalStateException(sm.getString("containerBase.child.start"), e);
 } finally {
 fireContainerEvent(ADD_CHILD_EVENT, child);
 }
@@ -834,7 +835,7 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 child.stop();
 }
 } catch (LifecycleException e) {
-log.error("ContainerBase.removeChild: stop: ", e);
+log.error(sm.getString("containerBase.child.stop"), e);
 }
 
 try {
@@ -845,7 +846,7 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 child.destroy();
 }
 } catch (LifecycleException e) {
-log.error("ContainerBase.removeChild: destroy: ", e);
+log.error(sm.getString("containerBase.child.destroy"), e);
 }
 
 synchronized(children) {
@@ -948,7 +949,6 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 ((Lifecycle) 

buildbot failure in on tomcat-85-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2733

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] b5aa51d89422035716c071cd2cc58149e27b1659
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

buildbot failure in on tomcat-9-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/773

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 90355dce4bffbce9f499e772a7db20490ac28b7c
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[Bug 62912] Tomcat adds a space character in the Content-Type header if this one has a ; character right after

[bugzilla]

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

--- Comment #16 from Mark Thomas  ---
Back-ported in:
- 9.0.x for 9.0.47 onwards
- 8.5.x for 8.5.67 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/03: Remove work-around for buggy Adobe Reader plug-in 9 on IE

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 5a6f30036d40d7e020d10a73e912314480dac0ce
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:21:40 2020 +0100

Remove work-around for buggy Adobe Reader plug-in 9 on IE
---
 java/org/apache/tomcat/util/http/parser/MediaType.java | 4 
 1 file changed, 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/MediaType.java 
b/java/org/apache/tomcat/util/http/parser/MediaType.java
index b4b84ae..2c548c0 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -78,10 +78,6 @@ public class MediaType {
 continue;
 }
 result.append(';');
-// Workaround for Adobe Read 9 plug-in on IE bug
-// Can be removed after 26 June 2013 (EOL of Reader 9)
-// See BZ 53814
-result.append(' ');
 result.append(entry.getKey());
 result.append('=');
 result.append(value);

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

[tomcat] 03/03: Update changelog

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit b5aa51d89422035716c071cd2cc58149e27b1659
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:23:52 2020 +0100

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 4131fc2..4e0e299 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,6 +139,11 @@
 before attempting conversion to String. Pull request provided by
 tianshuang. (markt)
   
+  
+62912: Don't mutate an application provided content header 
if
+it does not contain a charset. Also remove the outdated workaround for
+the buggy Adobe Reader 9 plug-in for IE. (markt)
+  
 
   
   

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

[tomcat] 01/03: Don't mutate a valid Content-type if it does not contain a charset

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a894442baf2c66807212d31c291af02edb2d04ad
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:20:34 2020 +0100

Don't mutate a valid Content-type if it does not contain a charset
---
 java/org/apache/catalina/connector/Response.java | 12 ++--
 java/org/apache/coyote/Response.java |  9 -
 test/org/apache/coyote/TestResponse.java |  2 --
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 0d59924..3ea84a7 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -769,9 +769,17 @@ public class Response implements HttpServletResponse {
 return;
 }
 
-getCoyoteResponse().setContentTypeNoCharset(m[0]);
 
-if (m[1] != null) {
+if (m[1] == null) {
+// No charset and we know value is valid as cache lookup was
+// successful
+// Pass-through user provided value in case user-agent is buggy and
+// requires specific format
+getCoyoteResponse().setContentTypeNoCharset(type);
+} else {
+// There is a charset so have to rebuild content-type without it
+getCoyoteResponse().setContentTypeNoCharset(m[0]);
+
 // Ignore charset if getWriter() has already been called
 if (!usingWriter) {
 try {
diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 3af1861..7080a52 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -531,7 +531,14 @@ public final class Response {
 
 String charsetValue = m.getCharset();
 
-if (charsetValue != null) {
+if (charsetValue == null) {
+// No charset and we know value is valid as parser was successful
+// Pass-through user provided value in case user-agent is buggy and
+// requires specific format
+this.contentType = type;
+} else {
+// There is a charset so have to rebuild content-type without it
+this.contentType = m.toStringNoCharset();
 charsetValue = charsetValue.trim();
 if (charsetValue.length() > 0) {
 try {
diff --git a/test/org/apache/coyote/TestResponse.java 
b/test/org/apache/coyote/TestResponse.java
index 15ecc3a..616 100644
--- a/test/org/apache/coyote/TestResponse.java
+++ b/test/org/apache/coyote/TestResponse.java
@@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -86,7 +85,6 @@ public class TestResponse extends TomcatBaseTest {
 }
 
 
-@Ignore // Disabled until Bug 62912 is addressed
 @Test
 public void testContentTypeWithoutSpace() throws Exception {
 doTestContentTypeSpacing(false);

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

[tomcat] branch 8.5.x updated (3e9dd49 -> b5aa51d)

[markt]

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

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 3e9dd49  Fix #419. Check parameter value size before conversion to 
String
 new a894442  Don't mutate a valid Content-type if it does not contain a 
charset
 new 5a6f300  Remove work-around for buggy Adobe Reader plug-in 9 on IE
 new b5aa51d  Update changelog

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/connector/Response.java   | 12 ++--
 java/org/apache/coyote/Response.java   |  9 -
 java/org/apache/tomcat/util/http/parser/MediaType.java |  4 
 test/org/apache/coyote/TestResponse.java   |  2 --
 webapps/docs/changelog.xml |  5 +
 5 files changed, 23 insertions(+), 9 deletions(-)

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

[tomcat] 01/03: Don't mutate a valid Content-type if it does not contain a charset

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 8182259ae385b080c895965612de284fcde0d774
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:20:34 2020 +0100

Don't mutate a valid Content-type if it does not contain a charset
---
 java/org/apache/catalina/connector/Response.java | 12 ++--
 java/org/apache/coyote/Response.java |  9 -
 test/org/apache/coyote/TestResponse.java |  2 --
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 578cbab..64976a8 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -766,9 +766,17 @@ public class Response implements HttpServletResponse {
 return;
 }
 
-getCoyoteResponse().setContentTypeNoCharset(m[0]);
 
-if (m[1] != null) {
+if (m[1] == null) {
+// No charset and we know value is valid as cache lookup was
+// successful
+// Pass-through user provided value in case user-agent is buggy and
+// requires specific format
+getCoyoteResponse().setContentTypeNoCharset(type);
+} else {
+// There is a charset so have to rebuild content-type without it
+getCoyoteResponse().setContentTypeNoCharset(m[0]);
+
 // Ignore charset if getWriter() has already been called
 if (!usingWriter) {
 try {
diff --git a/java/org/apache/coyote/Response.java 
b/java/org/apache/coyote/Response.java
index 5fb1476..d4af8e7 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -549,7 +549,14 @@ public final class Response {
 
 String charsetValue = m.getCharset();
 
-if (charsetValue != null) {
+if (charsetValue == null) {
+// No charset and we know value is valid as parser was successful
+// Pass-through user provided value in case user-agent is buggy and
+// requires specific format
+this.contentType = type;
+} else {
+// There is a charset so have to rebuild content-type without it
+this.contentType = m.toStringNoCharset();
 charsetValue = charsetValue.trim();
 if (charsetValue.length() > 0) {
 try {
diff --git a/test/org/apache/coyote/TestResponse.java 
b/test/org/apache/coyote/TestResponse.java
index 15ecc3a..616 100644
--- a/test/org/apache/coyote/TestResponse.java
+++ b/test/org/apache/coyote/TestResponse.java
@@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -86,7 +85,6 @@ public class TestResponse extends TomcatBaseTest {
 }
 
 
-@Ignore // Disabled until Bug 62912 is addressed
 @Test
 public void testContentTypeWithoutSpace() throws Exception {
 doTestContentTypeSpacing(false);

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

[tomcat] 03/03: Remove work-around for buggy Adobe Reader plug-in 9 on IE

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 90355dce4bffbce9f499e772a7db20490ac28b7c
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:21:40 2020 +0100

Remove work-around for buggy Adobe Reader plug-in 9 on IE
---
 java/org/apache/tomcat/util/http/parser/MediaType.java | 4 
 1 file changed, 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/MediaType.java 
b/java/org/apache/tomcat/util/http/parser/MediaType.java
index b4b84ae..2c548c0 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -78,10 +78,6 @@ public class MediaType {
 continue;
 }
 result.append(';');
-// Workaround for Adobe Read 9 plug-in on IE bug
-// Can be removed after 26 June 2013 (EOL of Reader 9)
-// See BZ 53814
-result.append(' ');
 result.append(entry.getKey());
 result.append('=');
 result.append(value);

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

[tomcat] branch 9.0.x updated (26624e2 -> 90355dc)

[markt]

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

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 26624e2  Fix #419. Check parameter value size before conversion to 
String
 new 8182259  Don't mutate a valid Content-type if it does not contain a 
charset
 new 0d70b97  Update changelog
 new 90355dc  Remove work-around for buggy Adobe Reader plug-in 9 on IE

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/connector/Response.java   | 12 ++--
 java/org/apache/coyote/Response.java   |  9 -
 java/org/apache/tomcat/util/http/parser/MediaType.java |  4 
 test/org/apache/coyote/TestResponse.java   |  2 --
 webapps/docs/changelog.xml |  5 +
 5 files changed, 23 insertions(+), 9 deletions(-)

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

[tomcat] 02/03: Update changelog

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 0d70b97edd4b1ddade29bac804aaca51a61b5291
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:23:52 2020 +0100

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 50d6c5c..8c58102 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,6 +139,11 @@
 before attempting conversion to String. Pull request provided by
 tianshuang. (markt)
   
+  
+62912: Don't mutate an application provided content header 
if
+it does not contain a charset. Also remove the outdated workaround for
+the buggy Adobe Reader 9 plug-in for IE. (markt)
+  
 
   
   

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

[tomcat] branch 8.5.x updated: Fix #419. Check parameter value size before conversion to String

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 3e9dd49  Fix #419. Check parameter value size before conversion to 
String
3e9dd49 is described below

commit 3e9dd49b20f9d6e270f8709d4f16d5595977595e
Author: Mark Thomas 
AuthorDate: Fri May 21 12:07:37 2021 +0100

Fix #419. Check parameter value size before conversion to String
---
 java/org/apache/catalina/connector/Request.java | 22 ++
 webapps/docs/changelog.xml  |  7 +++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index aa237b7..f331388 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2967,22 +2967,14 @@ public class Request implements HttpServletRequest {
 parts.add(part);
 if (part.getSubmittedFileName() == null) {
 String name = part.getName();
-String value = null;
-try {
-value = part.getString(charset.name());
-} catch (UnsupportedEncodingException uee) {
-// Not possible
-}
 if (maxPostSize >= 0) {
 // Have to calculate equivalent size. Not 
completely
 // accurate but close enough.
 postSize += name.getBytes(charset).length;
-if (value != null) {
-// Equals sign
-postSize++;
-// Value length
-postSize += part.getSize();
-}
+// Equals sign
+postSize++;
+// Value length
+postSize += part.getSize();
 // Value separator
 postSize++;
 if (postSize > maxPostSize) {
@@ -2991,6 +2983,12 @@ public class Request implements HttpServletRequest {
 "coyoteRequest.maxPostSizeExceeded"));
 }
 }
+String value = null;
+try {
+value = part.getString(charset.name());
+} catch (UnsupportedEncodingException uee) {
+// Not possible
+}
 parameters.addParameter(name, value);
 }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bf43b67..4131fc2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,13 @@
 Add cookieName attribute to the SSO valve to configure the
 SSO cookie name. (remm)
   
+  
+419: When processing POST requests of type
+multipart/form-data for parts without a filename that are
+added to the parameter map in String form, check the size of the part
+before attempting conversion to String. Pull request provided by
+tianshuang. (markt)
+  
 
   
   

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

[tomcat] branch 9.0.x updated: Fix #419. Check parameter value size before conversion to String

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 26624e2  Fix #419. Check parameter value size before conversion to 
String
26624e2 is described below

commit 26624e2aa72c504c2c91bd57ee6a59d88f90e55e
Author: Mark Thomas 
AuthorDate: Fri May 21 12:07:37 2021 +0100

Fix #419. Check parameter value size before conversion to String
---
 java/org/apache/catalina/connector/Request.java | 22 ++
 webapps/docs/changelog.xml  |  7 +++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 3172a19..e1a0e77 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2928,22 +2928,14 @@ public class Request implements HttpServletRequest {
 parts.add(part);
 if (part.getSubmittedFileName() == null) {
 String name = part.getName();
-String value = null;
-try {
-value = part.getString(charset.name());
-} catch (UnsupportedEncodingException uee) {
-// Not possible
-}
 if (maxPostSize >= 0) {
 // Have to calculate equivalent size. Not 
completely
 // accurate but close enough.
 postSize += name.getBytes(charset).length;
-if (value != null) {
-// Equals sign
-postSize++;
-// Value length
-postSize += part.getSize();
-}
+// Equals sign
+postSize++;
+// Value length
+postSize += part.getSize();
 // Value separator
 postSize++;
 if (postSize > maxPostSize) {
@@ -2952,6 +2944,12 @@ public class Request implements HttpServletRequest {
 "coyoteRequest.maxPostSizeExceeded"));
 }
 }
+String value = null;
+try {
+value = part.getString(charset.name());
+} catch (UnsupportedEncodingException uee) {
+// Not possible
+}
 parameters.addParameter(name, value);
 }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 52a3066..50d6c5c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,13 @@
 Add cookieName attribute to the SSO valve to configure the
 SSO cookie name. (remm)
   
+  
+419: When processing POST requests of type
+multipart/form-data for parts without a filename that are
+added to the parameter map in String form, check the size of the part
+before attempting conversion to String. Pull request provided by
+tianshuang. (markt)
+  
 
   
   

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

[GitHub] [tomcat] markt-asf closed pull request #419: part.getString will cause OOM without checking maxPostSize, checking maxPostSize first will avoid OOM caused by huge string

[GitBox]

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


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch master updated: Fix #419. Check parameter value size before conversion to String

[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 ac7f2f3  Fix #419. Check parameter value size before conversion to 
String
ac7f2f3 is described below

commit ac7f2f39ab7e6ed78e82b404d6a538d2bbfef219
Author: Mark Thomas 
AuthorDate: Fri May 21 12:07:37 2021 +0100

Fix #419. Check parameter value size before conversion to String
---
 java/org/apache/catalina/connector/Request.java | 22 ++
 webapps/docs/changelog.xml  |  7 +++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 12e5611..a9c247f 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2896,22 +2896,14 @@ public class Request implements HttpServletRequest {
 parts.add(part);
 if (part.getSubmittedFileName() == null) {
 String name = part.getName();
-String value = null;
-try {
-value = part.getString(charset.name());
-} catch (UnsupportedEncodingException uee) {
-// Not possible
-}
 if (maxPostSize >= 0) {
 // Have to calculate equivalent size. Not 
completely
 // accurate but close enough.
 postSize += name.getBytes(charset).length;
-if (value != null) {
-// Equals sign
-postSize++;
-// Value length
-postSize += part.getSize();
-}
+// Equals sign
+postSize++;
+// Value length
+postSize += part.getSize();
 // Value separator
 postSize++;
 if (postSize > maxPostSize) {
@@ -2920,6 +2912,12 @@ public class Request implements HttpServletRequest {
 "coyoteRequest.maxPostSizeExceeded"));
 }
 }
+String value = null;
+try {
+value = part.getString(charset.name());
+} catch (UnsupportedEncodingException uee) {
+// Not possible
+}
 parameters.addParameter(name, value);
 }
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 68065de..ea8d6df 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,13 @@
 encoding of the file. Based on a pull request by Jean-Louis Monteiro.
 (markt)
   
+  
+419: When processing POST requests of type
+multipart/form-data for parts without a filename that are
+added to the parameter map in String form, check the size of the part
+before attempting conversion to String. Pull request provided by
+tianshuang. (markt)
+  
 
   
   

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

[Bug 65317] PerMessageDeflate getMoreData doesn't return correct TransformationResult if the payload is inflated to exact 8192 bytes

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #4 from Mark Thomas  ---
All looks good. Thanks for the report and the patch.

Fixed in:
- 10.0.x for 10.0.7 onwards
- 9.0.x for 9.0.47 onwards
- 8.5.x for 8.5.67 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 bytes

[markt]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 3e1a392  Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 
bytes
3e1a392 is described below

commit 3e1a3928486ce4e39186330c54abbb44d9d5c690
Author: Mark Thomas 
AuthorDate: Fri May 21 11:44:00 2021 +0100

Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 bytes

Based on a patch provided by Saksham Verma.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65317
---
 .../apache/tomcat/websocket/PerMessageDeflate.java | 15 +++---
 .../tomcat/websocket/TestPerMessageDeflate.java| 61 +-
 webapps/docs/changelog.xml | 10 
 3 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/PerMessageDeflate.java 
b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
index afcfcf0..7fae225 100644
--- a/java/org/apache/tomcat/websocket/PerMessageDeflate.java
+++ b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
@@ -197,7 +197,7 @@ public class PerMessageDeflate implements Transformation {
 int written;
 boolean usedEomBytes = false;
 
-while (dest.remaining() > 0) {
+while (dest.remaining() > 0 || usedEomBytes) {
 // Space available in destination. Try and fill it.
 try {
 written = inflater.inflate(
@@ -210,12 +210,10 @@ public class PerMessageDeflate implements Transformation {
 dest.position(dest.position() + written);
 
 if (inflater.needsInput() && !usedEomBytes ) {
+readBuffer.clear();
+TransformationResult nextResult = next.getMoreData(opCode, 
fin, (rsv ^ RSV_BITMASK), readBuffer);
+inflater.setInput(readBuffer.array(), 
readBuffer.arrayOffset(), readBuffer.position());
 if (dest.hasRemaining()) {
-readBuffer.clear();
-TransformationResult nextResult =
-next.getMoreData(opCode, fin, (rsv ^ RSV_BITMASK), 
readBuffer);
-inflater.setInput(
-readBuffer.array(), readBuffer.arrayOffset(), 
readBuffer.position());
 if (TransformationResult.UNDERFLOW.equals(nextResult)) {
 return nextResult;
 } else if 
(TransformationResult.END_OF_FRAME.equals(nextResult) &&
@@ -227,6 +225,11 @@ public class PerMessageDeflate implements Transformation {
 return TransformationResult.END_OF_FRAME;
 }
 }
+} else if (readBuffer.position() > 0) {
+return TransformationResult.OVERFLOW;
+} else if (fin) {
+inflater.setInput(EOM_BYTES);
+usedEomBytes = true;
 }
 } else if (written == 0) {
 if (fin && (isServer && !clientContextTakeover ||
diff --git a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java 
b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
index 9139460..4538eba 100644
--- a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
+++ b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
@@ -26,6 +26,7 @@ import java.util.List;
 import javax.websocket.Extension;
 import javax.websocket.Extension.Parameter;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestPerMessageDeflate {
@@ -61,9 +62,61 @@ public class TestPerMessageDeflate {
 
 
 /*
- * Minimal implementation to enable other transformations to be tested.
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=65317
+ */
+@Test
+public void testMessagePartThatFillsBufffer() throws IOException {
+
+// Set up the extension using defaults
+List parameters = Collections.emptyList();
+List> preferences = new ArrayList<>();
+preferences.add(parameters);
+
+// Set up the compression and sending of the message.
+PerMessageDeflate perMessageDeflateTx = 
PerMessageDeflate.negotiate(preferences, true);
+perMessageDeflateTx.setNext(new TesterTransformation());
+
+byte[] data = new byte[8192];
+
+ByteBuffer bb = ByteBuffer.wrap(data);
+MessagePart mp = new MessagePart(true, 0, Constants.OPCODE_BINARY, bb, 
null, null, -1);
+
+List uncompressedParts = new ArrayList<>();
+uncompressedParts.add(mp);
+List compressedParts = 
perMessageDeflateTx.sendMessagePart(uncompressedParts);
+
+MessagePart compressedPart = compressedParts.get(0);
+
+// Set up the decompression and process the received messafe
+PerMessageDeflate perMessageDeflateRx = 
PerMessageDeflate.negotiate(preferences, 

[tomcat] branch 9.0.x updated: Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 bytes

[markt]

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

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new c2fe7be  Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 
bytes
c2fe7be is described below

commit c2fe7beb4b6e1473801b385425e240f4b0ed707a
Author: Mark Thomas 
AuthorDate: Fri May 21 11:44:00 2021 +0100

Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 bytes

Based on a patch provided by Saksham Verma.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65317
---
 .../apache/tomcat/websocket/PerMessageDeflate.java | 15 +++---
 .../tomcat/websocket/TestPerMessageDeflate.java| 61 +-
 webapps/docs/changelog.xml | 10 
 3 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/PerMessageDeflate.java 
b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
index afcfcf0..7fae225 100644
--- a/java/org/apache/tomcat/websocket/PerMessageDeflate.java
+++ b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
@@ -197,7 +197,7 @@ public class PerMessageDeflate implements Transformation {
 int written;
 boolean usedEomBytes = false;
 
-while (dest.remaining() > 0) {
+while (dest.remaining() > 0 || usedEomBytes) {
 // Space available in destination. Try and fill it.
 try {
 written = inflater.inflate(
@@ -210,12 +210,10 @@ public class PerMessageDeflate implements Transformation {
 dest.position(dest.position() + written);
 
 if (inflater.needsInput() && !usedEomBytes ) {
+readBuffer.clear();
+TransformationResult nextResult = next.getMoreData(opCode, 
fin, (rsv ^ RSV_BITMASK), readBuffer);
+inflater.setInput(readBuffer.array(), 
readBuffer.arrayOffset(), readBuffer.position());
 if (dest.hasRemaining()) {
-readBuffer.clear();
-TransformationResult nextResult =
-next.getMoreData(opCode, fin, (rsv ^ RSV_BITMASK), 
readBuffer);
-inflater.setInput(
-readBuffer.array(), readBuffer.arrayOffset(), 
readBuffer.position());
 if (TransformationResult.UNDERFLOW.equals(nextResult)) {
 return nextResult;
 } else if 
(TransformationResult.END_OF_FRAME.equals(nextResult) &&
@@ -227,6 +225,11 @@ public class PerMessageDeflate implements Transformation {
 return TransformationResult.END_OF_FRAME;
 }
 }
+} else if (readBuffer.position() > 0) {
+return TransformationResult.OVERFLOW;
+} else if (fin) {
+inflater.setInput(EOM_BYTES);
+usedEomBytes = true;
 }
 } else if (written == 0) {
 if (fin && (isServer && !clientContextTakeover ||
diff --git a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java 
b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
index 9139460..4538eba 100644
--- a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
+++ b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
@@ -26,6 +26,7 @@ import java.util.List;
 import javax.websocket.Extension;
 import javax.websocket.Extension.Parameter;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestPerMessageDeflate {
@@ -61,9 +62,61 @@ public class TestPerMessageDeflate {
 
 
 /*
- * Minimal implementation to enable other transformations to be tested.
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=65317
+ */
+@Test
+public void testMessagePartThatFillsBufffer() throws IOException {
+
+// Set up the extension using defaults
+List parameters = Collections.emptyList();
+List> preferences = new ArrayList<>();
+preferences.add(parameters);
+
+// Set up the compression and sending of the message.
+PerMessageDeflate perMessageDeflateTx = 
PerMessageDeflate.negotiate(preferences, true);
+perMessageDeflateTx.setNext(new TesterTransformation());
+
+byte[] data = new byte[8192];
+
+ByteBuffer bb = ByteBuffer.wrap(data);
+MessagePart mp = new MessagePart(true, 0, Constants.OPCODE_BINARY, bb, 
null, null, -1);
+
+List uncompressedParts = new ArrayList<>();
+uncompressedParts.add(mp);
+List compressedParts = 
perMessageDeflateTx.sendMessagePart(uncompressedParts);
+
+MessagePart compressedPart = compressedParts.get(0);
+
+// Set up the decompression and process the received messafe
+PerMessageDeflate perMessageDeflateRx = 
PerMessageDeflate.negotiate(preferences, 

[tomcat] branch master updated: Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 bytes

[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 814f578  Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 
bytes
814f578 is described below

commit 814f5781c98a0c5b7f5b2a00f37bfe9239038294
Author: Mark Thomas 
AuthorDate: Fri May 21 11:44:00 2021 +0100

Fix BZ 65317. Fix permessage-deflate with payloads of n*8192 bytes

Based on a patch provided by Saksham Verma.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65317
---
 .../apache/tomcat/websocket/PerMessageDeflate.java | 15 +++---
 .../tomcat/websocket/TestPerMessageDeflate.java| 61 +-
 webapps/docs/changelog.xml | 10 
 3 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/PerMessageDeflate.java 
b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
index c101916..95ff848 100644
--- a/java/org/apache/tomcat/websocket/PerMessageDeflate.java
+++ b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
@@ -197,7 +197,7 @@ public class PerMessageDeflate implements Transformation {
 int written;
 boolean usedEomBytes = false;
 
-while (dest.remaining() > 0) {
+while (dest.remaining() > 0 || usedEomBytes) {
 // Space available in destination. Try and fill it.
 try {
 written = inflater.inflate(
@@ -210,12 +210,10 @@ public class PerMessageDeflate implements Transformation {
 dest.position(dest.position() + written);
 
 if (inflater.needsInput() && !usedEomBytes ) {
+readBuffer.clear();
+TransformationResult nextResult = next.getMoreData(opCode, 
fin, (rsv ^ RSV_BITMASK), readBuffer);
+inflater.setInput(readBuffer.array(), 
readBuffer.arrayOffset(), readBuffer.position());
 if (dest.hasRemaining()) {
-readBuffer.clear();
-TransformationResult nextResult =
-next.getMoreData(opCode, fin, (rsv ^ RSV_BITMASK), 
readBuffer);
-inflater.setInput(
-readBuffer.array(), readBuffer.arrayOffset(), 
readBuffer.position());
 if (TransformationResult.UNDERFLOW.equals(nextResult)) {
 return nextResult;
 } else if 
(TransformationResult.END_OF_FRAME.equals(nextResult) &&
@@ -227,6 +225,11 @@ public class PerMessageDeflate implements Transformation {
 return TransformationResult.END_OF_FRAME;
 }
 }
+} else if (readBuffer.position() > 0) {
+return TransformationResult.OVERFLOW;
+} else if (fin) {
+inflater.setInput(EOM_BYTES);
+usedEomBytes = true;
 }
 } else if (written == 0) {
 if (fin && (isServer && !clientContextTakeover ||
diff --git a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java 
b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
index d2b74e9..0c6a17e 100644
--- a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
+++ b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
@@ -26,6 +26,7 @@ import java.util.List;
 import jakarta.websocket.Extension;
 import jakarta.websocket.Extension.Parameter;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestPerMessageDeflate {
@@ -61,9 +62,61 @@ public class TestPerMessageDeflate {
 
 
 /*
- * Minimal implementation to enable other transformations to be tested.
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=65317
+ */
+@Test
+public void testMessagePartThatFillsBufffer() throws IOException {
+
+// Set up the extension using defaults
+List parameters = Collections.emptyList();
+List> preferences = new ArrayList<>();
+preferences.add(parameters);
+
+// Set up the compression and sending of the message.
+PerMessageDeflate perMessageDeflateTx = 
PerMessageDeflate.negotiate(preferences, true);
+perMessageDeflateTx.setNext(new TesterTransformation());
+
+byte[] data = new byte[8192];
+
+ByteBuffer bb = ByteBuffer.wrap(data);
+MessagePart mp = new MessagePart(true, 0, Constants.OPCODE_BINARY, bb, 
null, null, -1);
+
+List uncompressedParts = new ArrayList<>();
+uncompressedParts.add(mp);
+List compressedParts = 
perMessageDeflateTx.sendMessagePart(uncompressedParts);
+
+MessagePart compressedPart = compressedParts.get(0);
+
+// Set up the decompression and process the received messafe
+PerMessageDeflate perMessageDeflateRx = 
PerMessageDeflate.negotiate(preferences, 

Re: [External] : Re: JDK 17 Early Access build 23 is available

[Rory O'Donnell]

Thanks Martin!

On 21/05/2021 08:47, Martin Grigorov wrote:

Hi Rory,

Apache Tomcat's build and tests pass successfully with JDK 17-ea+23-2064 on
Linux x86_64 and aarch64!

Regards,
Martin

On Fri, May 21, 2021 at 10:38 AM Rory O'Donnell 
wrote:


Hi Mark, **

*OpenJDK 17 Early Access build 23 is now available at
*_*https://urldefense.com/v3/__https://jdk.java.net/17*__;Kg!!GqivPVa7Brio!I5tWF5pl6m5fSJ6yQoJ37EaxLRaj7RCTF_0W2QaML5WhIAdXRQy-KeypUdkTsdPdko4$
  
_

   * These early-access , open-source builds are provided under the
   o GNU General Public License, version 2, with the Classpath
 Exception 
   * JEPs targeted to JDK 17, so far:
   o JEP 356: _Enhanced Pseudo-Random Number Generators
 _
   o JEP 382: _New macOS Rendering Pipeline
 _
   o JEP 391: _macOS/AArch64 Port _
   o JEP 398: _Deprecate the Applet API for Removal
 _
   o JEP 409: _Sealed Classes _
   o JEP 410: _Remove the Experimental AOT and JIT Compiler
 _
   o JEP 412: _Foreign Function & Memory API (Incubator)
 _
   o JEP 414: _Vector API (Second Incubator)
 _
   * Release Notes are available at
 
_https://urldefense.com/v3/__https://jdk.java.net/17/release-notes__;!!GqivPVa7Brio!I5tWF5pl6m5fSJ6yQoJ37EaxLRaj7RCTF_0W2QaML5WhIAdXRQy-KeypUdkTY7tpaOg$
 
_
   * Changes in recent builds that maybe of interest:
   o Build 23
   + JDK-8243287: Removal of Unsafe::defineAnonymousClass.
   o Build 22
   + *JDK-8266369: New implementation of
 java.nio.channels.Selector on Microsoft Windows. *
   o Build 21
   + *JDK-8196415: JARs signed with SHA-1 algorithms are
 restricted by default.*
   + *JDK-8266858: macOS on ARM early access available.*
   # The ARM port should behave similarly to the Intel port.
 There are no known feature differences.
   # When reporting issues on macOS please specify if using
 ARM or x64.

*We need your help in testing new Selector implementation on Windows [1]:*

   * The implementation of the Selector API on Windows has been replaced
 in JDK 17 b22 with a new more scalable implementation [2].
   * The old select based Selector implementation has been the default
 since Java 1.4 (2002) so replacing it is a significant change.
   * It would be really helpful to get more testing of the new
 implementation before the fork for Rampdown Phase One on June 10th.

*Other Topics which might be of Interest:*

   * Updates to JEP 411: Deprecate the Security Manager for Removal |
 _Link_
 
   * "The meaning, or not, of “LTS” | _Link_
 
   * JFR Remote Recording Stream | _Link_
 


*Project Loom Early-Access Build: **_Build 17-loom+7-342_*
*(2021/5/11)*

   * These early-access builds are provided under the _GNU General Public
 License, version 2, with the Classpath Exception_
 .
   * These builds are produced for the purpose of gathering feedback. Use
 for any other purpose is at your own risk.
   * Please send feedback via e-mail to _loom-...@openjdk.java.net
 _.To send e-mail to this address
 you must first _subscribe to the mailing list_
 .

*Project Panama Early-Access Build: *_*Build 17-panama+3-167*
_*(2021/5/18)*

   * These early-access builds are provided under the _GNU General Public
 License, version 2, with the Classpath Exception_
 .
   * This build is aimed at testing a prototype implementation of the
 foreign memory support, foreign function 

Re: JDK 17 Early Access build 23 is available

[Rémy Maucherat]

On Fri, May 21, 2021 at 9:38 AM Rory O'Donnell 
wrote:

> Hi Mark, **
>
> *OpenJDK 17 Early Access build 23 is now available at
> *_*https://jdk.java.net/17* _
>
>   * These early-access , open-source builds are provided under the
>   o GNU General Public License, version 2, with the Classpath
> Exception 
>   * JEPs targeted to JDK 17, so far:
>   o JEP 356: _Enhanced Pseudo-Random Number Generators
> _
>   o JEP 382: _New macOS Rendering Pipeline
> _
>   o JEP 391: _macOS/AArch64 Port _
>   o JEP 398: _Deprecate the Applet API for Removal
> _
>   o JEP 409: _Sealed Classes _
>   o JEP 410: _Remove the Experimental AOT and JIT Compiler
> _
>   o JEP 412: _Foreign Function & Memory API (Incubator)
> _
>   o JEP 414: _Vector API (Second Incubator)
> _
>   * Release Notes are available at
> _https://jdk.java.net/17/release-notes
> _
>   * Changes in recent builds that maybe of interest:
>   o Build 23
>   + JDK-8243287: Removal of Unsafe::defineAnonymousClass.
>   o Build 22
>   + *JDK-8266369: New implementation of
> java.nio.channels.Selector on Microsoft Windows. *
>

So, ok, that's quite the bomb for Windows users.
https://bugs.openjdk.java.net/browse/JDK-8266369

Rémy


>   o Build 21
>   + *JDK-8196415: JARs signed with SHA-1 algorithms are
> restricted by default.*
>   + *JDK-8266858: macOS on ARM early access available.*
>   # The ARM port should behave similarly to the Intel port.
> There are no known feature differences.
>   # When reporting issues on macOS please specify if using
> ARM or x64.
>
> *We need your help in testing new Selector implementation on Windows [1]:*
>
>   * The implementation of the Selector API on Windows has been replaced
> in JDK 17 b22 with a new more scalable implementation [2].
>   * The old select based Selector implementation has been the default
> since Java 1.4 (2002) so replacing it is a significant change.
>   * It would be really helpful to get more testing of the new
> implementation before the fork for Rampdown Phase One on June 10th.
>
> *Other Topics which might be of Interest:*
>
>   * Updates to JEP 411: Deprecate the Security Manager for Removal |
> _Link_
> 
>   * "The meaning, or not, of “LTS” | _Link_
> 
>   * JFR Remote Recording Stream | _Link_
> 
>
> *Project Loom Early-Access Build: **_Build 17-loom+7-342_*
> *(2021/5/11)*
>
>   * These early-access builds are provided under the _GNU General Public
> License, version 2, with the Classpath Exception_
> .
>   * These builds are produced for the purpose of gathering feedback. Use
> for any other purpose is at your own risk.
>   * Please send feedback via e-mail to _loom-...@openjdk.java.net
> _.To send e-mail to this address
> you must first _subscribe to the mailing list_
> .
>
> *Project Panama Early-Access Build: *_*Build 17-panama+3-167*
> _*(2021/5/18)*
>
>   * These early-access builds are provided under the _GNU General Public
> License, version 2, with the Classpath Exception_
> .
>   * This build is aimed at testing a prototype implementation of the
> foreign memory support, foreign function support and native
> extraction tooling from the "foreign-jextract" branch of the Panama
> repo.
>   * Please send feedback via e-mail to _panama-...@openjdk.java.net
> _. To send e-mail to this
> address you must first _subscribe to the mailing list_
> .
>
>
> Rgds,Rory
>
>
> [1]
> _https://mail.openjdk.java.net/pipermail/nio-dev/2021-May/008988.html_
> 
> [2] _https://bugs.openjdk.java.net/browse/JDK-8266369_
> 
>
> --
> Rgds, Rory O'Donnell
> Quality Engineering Manager
> Oracle EMEA, Dublin, Ireland
>
>

Re: JDK 17 Early Access build 23 is available

[Martin Grigorov]

Hi Rory,

Apache Tomcat's build and tests pass successfully with JDK 17-ea+23-2064 on
Linux x86_64 and aarch64!

Regards,
Martin

On Fri, May 21, 2021 at 10:38 AM Rory O'Donnell 
wrote:

> Hi Mark, **
>
> *OpenJDK 17 Early Access build 23 is now available at
> *_*https://jdk.java.net/17* _
>
>   * These early-access , open-source builds are provided under the
>   o GNU General Public License, version 2, with the Classpath
> Exception 
>   * JEPs targeted to JDK 17, so far:
>   o JEP 356: _Enhanced Pseudo-Random Number Generators
> _
>   o JEP 382: _New macOS Rendering Pipeline
> _
>   o JEP 391: _macOS/AArch64 Port _
>   o JEP 398: _Deprecate the Applet API for Removal
> _
>   o JEP 409: _Sealed Classes _
>   o JEP 410: _Remove the Experimental AOT and JIT Compiler
> _
>   o JEP 412: _Foreign Function & Memory API (Incubator)
> _
>   o JEP 414: _Vector API (Second Incubator)
> _
>   * Release Notes are available at
> _https://jdk.java.net/17/release-notes
> _
>   * Changes in recent builds that maybe of interest:
>   o Build 23
>   + JDK-8243287: Removal of Unsafe::defineAnonymousClass.
>   o Build 22
>   + *JDK-8266369: New implementation of
> java.nio.channels.Selector on Microsoft Windows. *
>   o Build 21
>   + *JDK-8196415: JARs signed with SHA-1 algorithms are
> restricted by default.*
>   + *JDK-8266858: macOS on ARM early access available.*
>   # The ARM port should behave similarly to the Intel port.
> There are no known feature differences.
>   # When reporting issues on macOS please specify if using
> ARM or x64.
>
> *We need your help in testing new Selector implementation on Windows [1]:*
>
>   * The implementation of the Selector API on Windows has been replaced
> in JDK 17 b22 with a new more scalable implementation [2].
>   * The old select based Selector implementation has been the default
> since Java 1.4 (2002) so replacing it is a significant change.
>   * It would be really helpful to get more testing of the new
> implementation before the fork for Rampdown Phase One on June 10th.
>
> *Other Topics which might be of Interest:*
>
>   * Updates to JEP 411: Deprecate the Security Manager for Removal |
> _Link_
> 
>   * "The meaning, or not, of “LTS” | _Link_
> 
>   * JFR Remote Recording Stream | _Link_
> 
>
> *Project Loom Early-Access Build: **_Build 17-loom+7-342_*
> *(2021/5/11)*
>
>   * These early-access builds are provided under the _GNU General Public
> License, version 2, with the Classpath Exception_
> .
>   * These builds are produced for the purpose of gathering feedback. Use
> for any other purpose is at your own risk.
>   * Please send feedback via e-mail to _loom-...@openjdk.java.net
> _.To send e-mail to this address
> you must first _subscribe to the mailing list_
> .
>
> *Project Panama Early-Access Build: *_*Build 17-panama+3-167*
> _*(2021/5/18)*
>
>   * These early-access builds are provided under the _GNU General Public
> License, version 2, with the Classpath Exception_
> .
>   * This build is aimed at testing a prototype implementation of the
> foreign memory support, foreign function support and native
> extraction tooling from the "foreign-jextract" branch of the Panama
> repo.
>   * Please send feedback via e-mail to _panama-...@openjdk.java.net
> _. To send e-mail to this
> address you must first _subscribe to the mailing list_
> .
>
>
> Rgds,Rory
>
>
> [1]
> _https://mail.openjdk.java.net/pipermail/nio-dev/2021-May/008988.html_
> 
> [2] _https://bugs.openjdk.java.net/browse/JDK-8266369_
> 
>
> --
> Rgds, Rory O'Donnell
> Quality Engineering Manager
> Oracle EMEA, Dublin, Ireland
>
>

JDK 17 Early Access build 23 is available

[Rory O'Donnell]

Hi Mark, **

*OpenJDK 17 Early Access build 23 is now available at 
*_*https://jdk.java.net/17* _


 * These early-access , open-source builds are provided under the
 o GNU General Public License, version 2, with the Classpath
   Exception 
 * JEPs targeted to JDK 17, so far:
 o JEP 356: _Enhanced Pseudo-Random Number Generators
   _
 o JEP 382: _New macOS Rendering Pipeline
   _
 o JEP 391: _macOS/AArch64 Port _
 o JEP 398: _Deprecate the Applet API for Removal
   _
 o JEP 409: _Sealed Classes _
 o JEP 410: _Remove the Experimental AOT and JIT Compiler
   _
 o JEP 412: _Foreign Function & Memory API (Incubator)
   _
 o JEP 414: _Vector API (Second Incubator)
   _
 * Release Notes are available at
   _https://jdk.java.net/17/release-notes
   _
 * Changes in recent builds that maybe of interest:
 o Build 23
 + JDK-8243287: Removal of Unsafe::defineAnonymousClass.
 o Build 22
 + *JDK-8266369: New implementation of
   java.nio.channels.Selector on Microsoft Windows. *
 o Build 21
 + *JDK-8196415: JARs signed with SHA-1 algorithms are
   restricted by default.*
 + *JDK-8266858: macOS on ARM early access available.*
 # The ARM port should behave similarly to the Intel port.
   There are no known feature differences.
 # When reporting issues on macOS please specify if using
   ARM or x64.

*We need your help in testing new Selector implementation on Windows [1]:*

 * The implementation of the Selector API on Windows has been replaced
   in JDK 17 b22 with a new more scalable implementation [2].
 * The old select based Selector implementation has been the default
   since Java 1.4 (2002) so replacing it is a significant change.
 * It would be really helpful to get more testing of the new
   implementation before the fork for Rampdown Phase One on June 10th.

*Other Topics which might be of Interest:*

 * Updates to JEP 411: Deprecate the Security Manager for Removal |
   _Link_
   
 * "The meaning, or not, of “LTS” | _Link_
   
 * JFR Remote Recording Stream | _Link_
   

*Project Loom Early-Access Build: **_Build 17-loom+7-342_* 
*(2021/5/11)*


 * These early-access builds are provided under the _GNU General Public
   License, version 2, with the Classpath Exception_
   .
 * These builds are produced for the purpose of gathering feedback. Use
   for any other purpose is at your own risk.
 * Please send feedback via e-mail to _loom-...@openjdk.java.net
   _.To send e-mail to this address
   you must first _subscribe to the mailing list_
   .

*Project Panama Early-Access Build: *_*Build 17-panama+3-167* 
_*(2021/5/18)*


 * These early-access builds are provided under the _GNU General Public
   License, version 2, with the Classpath Exception_
   .
 * This build is aimed at testing a prototype implementation of the
   foreign memory support, foreign function support and native
   extraction tooling from the "foreign-jextract" branch of the Panama
   repo.
 * Please send feedback via e-mail to _panama-...@openjdk.java.net
   _. To send e-mail to this
   address you must first _subscribe to the mailing list_
   .


Rgds,Rory


[1] 
_https://mail.openjdk.java.net/pipermail/nio-dev/2021-May/008988.html_ 

[2] _https://bugs.openjdk.java.net/browse/JDK-8266369_ 



--
Rgds, Rory O'Donnell
Quality Engineering Manager
Oracle EMEA, Dublin, Ireland