[tomcat] branch main updated: jarsToSkip += derby-*.jar jaxws-rt-*.jar

2022-01-24 Thread michaelo
This is an automated email from the ASF dual-hosted git repository.

michaelo 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 1710c7b  jarsToSkip += derby-*.jar jaxws-rt-*.jar
1710c7b is described below

commit 1710c7ba940f114a11fbc7fe8f10b2c68d95d9b7
Author: Michael Osipov 
AuthorDate: Mon Jan 24 12:01:43 2022 +0100

jarsToSkip += derby-*.jar jaxws-rt-*.jar
---
 conf/catalina.properties   | 2 ++
 webapps/docs/changelog.xml | 5 +
 2 files changed, 7 insertions(+)

diff --git a/conf/catalina.properties b/conf/catalina.properties
index 2596547..6a31180 100644
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -141,6 +141,7 @@ ecj-*.jar,\
 el-api.jar,\
 geronimo-spec-jaxrpc*.jar,\
 h2*.jar,\
+ha-api-*.jar,\
 hamcrest-*.jar,\
 hibernate*.jar,\
 httpclient*.jar,\
@@ -151,6 +152,7 @@ jasper.jar,\
 jaspic-api.jar,\
 jaxb-*.jar,\
 jaxen-*.jar,\
+jaxws-rt-*.jar,\
 jdom-*.jar,\
 jetty-*.jar,\
 jmx-tools.jar,\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9ba81fb..2d13033 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -720,6 +720,11 @@
 447. Correct JPMS metadata for catalina.jar. Pull request
 provided by Hui Wang. (markt)
   
+  
+Add ha-api-*.jar and jaxws-rt-*.jar to the
+list of JARs to skip when scanning for TLDs, web fragments and
+annotations. (michaelo)
+  
 
   
   

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



Re: [tomcat] branch main updated: jarsToSkip += derby-*.jar

2021-09-03 Thread Mark Thomas

On 03/09/2021 15:02, Rémy Maucherat wrote:

On Fri, Sep 3, 2021 at 10:03 AM  wrote:


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 e9cbd4c  jarsToSkip += derby-*.jar
e9cbd4c is described below

commit e9cbd4c2cdb958930fed1cfeabdd3e911fc8b1e6
Author: Mark Thomas 
AuthorDate: Fri Sep 3 09:02:05 2021 +0100

 jarsToSkip += derby-*.jar


Thanks, I always keep forgetting that ...


No worries. I only noticed it because I happened to see the stack traces 
related to the failed scan.


Mark



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



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




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



Re: [tomcat] branch main updated: jarsToSkip += derby-*.jar

2021-09-03 Thread Rémy Maucherat
On Fri, Sep 3, 2021 at 10:03 AM  wrote:
>
> 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 e9cbd4c  jarsToSkip += derby-*.jar
> e9cbd4c is described below
>
> commit e9cbd4c2cdb958930fed1cfeabdd3e911fc8b1e6
> Author: Mark Thomas 
> AuthorDate: Fri Sep 3 09:02:05 2021 +0100
>
> jarsToSkip += derby-*.jar

Thanks, I always keep forgetting that ...

Rémy

> ---
>  conf/catalina.properties   | 1 +
>  webapps/docs/changelog.xml | 4 
>  2 files changed, 5 insertions(+)
>
> diff --git a/conf/catalina.properties b/conf/catalina.properties
> index 012d8fd..d73a8bf 100644
> --- a/conf/catalina.properties
> +++ b/conf/catalina.properties
> @@ -134,6 +134,7 @@ commons-lang*.jar,\
>  commons-logging*.jar,\
>  commons-math*.jar,\
>  commons-pool*.jar,\
> +derby-*.jar,\
>  dom4j-*.jar,\
>  easymock-*.jar,\
>  ecj-*.jar,\
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index 6e55bef..36966ab 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -148,6 +148,10 @@
>  contents, and add an option to have it be static, similar to the 
> other
>  realms. (remm)
>
> +  
> +Add derby-*.jar to the list of JARs to skip when 
> scanning
> +for TLDs, web fragments and annotations. (markt)
> +  
>  
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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



[tomcat] branch main updated: jarsToSkip += derby-*.jar

2021-09-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new e9cbd4c  jarsToSkip += derby-*.jar
e9cbd4c is described below

commit e9cbd4c2cdb958930fed1cfeabdd3e911fc8b1e6
Author: Mark Thomas 
AuthorDate: Fri Sep 3 09:02:05 2021 +0100

jarsToSkip += derby-*.jar
---
 conf/catalina.properties   | 1 +
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+)

diff --git a/conf/catalina.properties b/conf/catalina.properties
index 012d8fd..d73a8bf 100644
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -134,6 +134,7 @@ commons-lang*.jar,\
 commons-logging*.jar,\
 commons-math*.jar,\
 commons-pool*.jar,\
+derby-*.jar,\
 dom4j-*.jar,\
 easymock-*.jar,\
 ecj-*.jar,\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6e55bef..36966ab 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -148,6 +148,10 @@
 contents, and add an option to have it be static, similar to the other
 realms. (remm)
   
+  
+Add derby-*.jar to the list of JARs to skip when scanning
+for TLDs, web fragments and annotations. (markt)
+  
 
   
   

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