(tomcat) branch 10.1.x updated: Fix BZ 68124

2023-11-20 Thread lihan
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new c8e3b5e721 Fix BZ 68124
c8e3b5e721 is described below

commit c8e3b5e721d5e67fa1fe42eef03bc5e378af6f4e
Author: lihan 
AuthorDate: Mon Nov 20 18:16:26 2023 +0800

Fix BZ 68124

https://bz.apache.org/bugzilla/show_bug.cgi?id=68124
---
 webapps/docs/appdev/sample/sample.war | Bin 4606 -> 4704 bytes
 webapps/docs/changelog.xml|   7 +++
 2 files changed, 7 insertions(+)

diff --git a/webapps/docs/appdev/sample/sample.war 
b/webapps/docs/appdev/sample/sample.war
index 0a127e6bd1..b879399810 100644
Binary files a/webapps/docs/appdev/sample/sample.war and 
b/webapps/docs/appdev/sample/sample.war differ
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 93bf4d1104..93e5bba5d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,13 @@
   
 
   
+  
+
+  
+68124: Migrate sample.war from javax to jakarta. (lihan)
+  
+
+  
 
 
   


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



(tomcat) branch main updated: Fix BZ 68124

2023-11-20 Thread lihan
This is an automated email from the ASF dual-hosted git repository.

lihan 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 5c93608da1 Fix BZ 68124
5c93608da1 is described below

commit 5c93608da1e75066e4c4bb70dcda495e944261a7
Author: lihan 
AuthorDate: Mon Nov 20 18:16:26 2023 +0800

Fix BZ 68124

https://bz.apache.org/bugzilla/show_bug.cgi?id=68124
---
 webapps/docs/appdev/sample/sample.war | Bin 4606 -> 4704 bytes
 webapps/docs/changelog.xml|   3 +++
 2 files changed, 3 insertions(+)

diff --git a/webapps/docs/appdev/sample/sample.war 
b/webapps/docs/appdev/sample/sample.war
index 0a127e6bd1..b879399810 100644
Binary files a/webapps/docs/appdev/sample/sample.war and 
b/webapps/docs/appdev/sample/sample.war differ
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6140c4dbdf..8ac8b81fa3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,9 @@
   
 Update the OWB module to Apache OpenWebBeans 4.0.0. (remm)
   
+  
+68124: Migrate sample.war from javax to jakarta. (lihan)
+  
 
   
 


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



[Bug 68124] Outdated sample.war artifact

2023-11-20 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68124

Han Li  changed:

   What|Removed |Added

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

--- Comment #1 from Han Li  ---
Fixed in:
- 11.0.x for 11.0.0-M15 onwards
- 10.1.x for 10.1.17 onwards


9.0.x is not affected.

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



Re: [PR] Making sure that stop is not "blocked" by the check() in HostConfig [tomcat]

2023-11-20 Thread via GitHub


jfclere commented on PR #641:
URL: https://github.com/apache/tomcat/pull/641#issuecomment-1819080600

   See 
https://github.com/apache/tomcat/commit/dce1fc833b5192ec0ccee7d4120a050cee5da8de
   the exceptions are gone but now the stop() is blocked by the check(String 
name) but the fix is easy don't wait for removed war resources.


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

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

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


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



Re: [PR] Making sure that stop is not "blocked" by the check() in HostConfig [tomcat]

2023-11-20 Thread via GitHub


jfclere closed pull request #641: Making sure that stop is not "blocked" by the 
check() in HostConfig
URL: https://github.com/apache/tomcat/pull/641


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

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

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


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



(tomcat) branch main updated: Fix sync inconsistency on host config object vs host object

2023-11-20 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 4ed9f95fe7 Fix sync inconsistency on host config object vs host object
4ed9f95fe7 is described below

commit 4ed9f95fe762b3a00bb4488a4da227dcada31f51
Author: remm 
AuthorDate: Mon Nov 20 15:38:39 2023 +0100

Fix sync inconsistency on host config object vs host object

The host object should be used since its lifecycle is relevant.
---
 java/org/apache/catalina/startup/HostConfig.java | 108 ---
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index 3c35b8ef09..52e75eeed6 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -308,13 +308,15 @@ public class HostConfig implements LifecycleListener {
  * @return 0L if no application with that name is deployed, or the instant
  *  on which the application was deployed
  */
-public synchronized long getDeploymentTime(String name) {
-DeployedApplication app = deployed.get(name);
-if (app == null) {
-return 0L;
-}
+public long getDeploymentTime(String name) {
+synchronized (host) {
+DeployedApplication app = deployed.get(name);
+if (app == null) {
+return 0L;
+}
 
-return app.timestamp;
+return app.timestamp;
+}
 }
 
 
@@ -1311,7 +1313,7 @@ public class HostConfig implements LifecycleListener {
  *  least as long ago as the resolution of the file time stamp
  *  be skipped
  */
-protected synchronized void checkResources(DeployedApplication app,
+protected void checkResources(DeployedApplication app,
 boolean skipFileModificationResolutionCheck) {
 String[] resources =
 app.redeployResources.keySet().toArray(new String[0]);
@@ -1710,57 +1712,59 @@ public class HostConfig implements LifecycleListener {
  * Check for old versions of applications using parallel deployment that 
are
  * now unused (have no active sessions) and undeploy any that are found.
  */
-public synchronized void checkUndeploy() {
-if (deployed.size() < 2) {
-return;
-}
-
-// Need ordered set of names
-SortedSet sortedAppNames = new TreeSet<>(deployed.keySet());
-
-Iterator iter = sortedAppNames.iterator();
-
-ContextName previous = new ContextName(iter.next(), false);
-do {
-ContextName current = new ContextName(iter.next(), false);
+public void checkUndeploy() {
+synchronized (host) {
+if (deployed.size() < 2) {
+return;
+}
 
-if (current.getPath().equals(previous.getPath())) {
-// Current and previous are same path - current will always
-// be a later version
-Context previousContext = (Context) 
host.findChild(previous.getName());
-Context currentContext = (Context) 
host.findChild(current.getName());
-if (previousContext != null && currentContext != null &&
-currentContext.getState().isAvailable() &&
-tryAddServiced(previous.getName())) {
-try {
-Manager manager = previousContext.getManager();
-if (manager != null) {
-int sessionCount;
-if (manager instanceof DistributedManager) {
-sessionCount = ((DistributedManager) 
manager).getActiveSessionsFull();
-} else {
-sessionCount = manager.getActiveSessions();
-}
-if (sessionCount == 0) {
-if (log.isInfoEnabled()) {
-
log.info(sm.getString("hostConfig.undeployVersion", previous.getName()));
+// Need ordered set of names
+SortedSet sortedAppNames = new 
TreeSet<>(deployed.keySet());
+
+Iterator iter = sortedAppNames.iterator();
+
+ContextName previous = new ContextName(iter.next(), false);
+do {
+ContextName current = new ContextName(iter.next(), false);
+
+if (current.getPath().equals(previous.getPath())) {
+// Current and previous are same path - current will always
+// be a later version
+Context previousContext = (Context) 
host.findChild(previous.getName());
+Context currentContext = (C

(tomcat) branch 10.1.x updated: Fix sync inconsistency on host config object vs host object

2023-11-20 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 1ab185e8b2 Fix sync inconsistency on host config object vs host object
1ab185e8b2 is described below

commit 1ab185e8b2f09701bade9942b41610a7e6f5b30e
Author: remm 
AuthorDate: Mon Nov 20 15:38:39 2023 +0100

Fix sync inconsistency on host config object vs host object

The host object should be used since its lifecycle is relevant.
---
 java/org/apache/catalina/startup/HostConfig.java | 108 ---
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index 0e1288668b..fecfb3fc49 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -344,13 +344,15 @@ public class HostConfig implements LifecycleListener {
  * @return 0L if no application with that name is deployed, or the instant
  *  on which the application was deployed
  */
-public synchronized long getDeploymentTime(String name) {
-DeployedApplication app = deployed.get(name);
-if (app == null) {
-return 0L;
-}
+public long getDeploymentTime(String name) {
+synchronized (host) {
+DeployedApplication app = deployed.get(name);
+if (app == null) {
+return 0L;
+}
 
-return app.timestamp;
+return app.timestamp;
+}
 }
 
 
@@ -1347,7 +1349,7 @@ public class HostConfig implements LifecycleListener {
  *  least as long ago as the resolution of the file time stamp
  *  be skipped
  */
-protected synchronized void checkResources(DeployedApplication app,
+protected void checkResources(DeployedApplication app,
 boolean skipFileModificationResolutionCheck) {
 String[] resources =
 app.redeployResources.keySet().toArray(new String[0]);
@@ -1746,57 +1748,59 @@ public class HostConfig implements LifecycleListener {
  * Check for old versions of applications using parallel deployment that 
are
  * now unused (have no active sessions) and undeploy any that are found.
  */
-public synchronized void checkUndeploy() {
-if (deployed.size() < 2) {
-return;
-}
-
-// Need ordered set of names
-SortedSet sortedAppNames = new TreeSet<>(deployed.keySet());
-
-Iterator iter = sortedAppNames.iterator();
-
-ContextName previous = new ContextName(iter.next(), false);
-do {
-ContextName current = new ContextName(iter.next(), false);
+public void checkUndeploy() {
+synchronized (host) {
+if (deployed.size() < 2) {
+return;
+}
 
-if (current.getPath().equals(previous.getPath())) {
-// Current and previous are same path - current will always
-// be a later version
-Context previousContext = (Context) 
host.findChild(previous.getName());
-Context currentContext = (Context) 
host.findChild(current.getName());
-if (previousContext != null && currentContext != null &&
-currentContext.getState().isAvailable() &&
-tryAddServiced(previous.getName())) {
-try {
-Manager manager = previousContext.getManager();
-if (manager != null) {
-int sessionCount;
-if (manager instanceof DistributedManager) {
-sessionCount = ((DistributedManager) 
manager).getActiveSessionsFull();
-} else {
-sessionCount = manager.getActiveSessions();
-}
-if (sessionCount == 0) {
-if (log.isInfoEnabled()) {
-
log.info(sm.getString("hostConfig.undeployVersion", previous.getName()));
+// Need ordered set of names
+SortedSet sortedAppNames = new 
TreeSet<>(deployed.keySet());
+
+Iterator iter = sortedAppNames.iterator();
+
+ContextName previous = new ContextName(iter.next(), false);
+do {
+ContextName current = new ContextName(iter.next(), false);
+
+if (current.getPath().equals(previous.getPath())) {
+// Current and previous are same path - current will always
+// be a later version
+Context previousContext = (Context) 
host.findChild(previous.getName());
+Context currentContext 

(tomcat) branch 9.0.x updated: Fix sync inconsistency on host config object vs host object

2023-11-20 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new e97703fcf3 Fix sync inconsistency on host config object vs host object
e97703fcf3 is described below

commit e97703fcf37b5bcc405b98dce8fdc5c4e562fd20
Author: remm 
AuthorDate: Mon Nov 20 15:38:39 2023 +0100

Fix sync inconsistency on host config object vs host object

The host object should be used since its lifecycle is relevant.
---
 java/org/apache/catalina/startup/HostConfig.java | 108 ---
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index c915734c7f..f626961d94 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -394,13 +394,15 @@ public class HostConfig implements LifecycleListener {
  * @return 0L if no application with that name is deployed, or the instant
  *  on which the application was deployed
  */
-public synchronized long getDeploymentTime(String name) {
-DeployedApplication app = deployed.get(name);
-if (app == null) {
-return 0L;
-}
+public long getDeploymentTime(String name) {
+synchronized (host) {
+DeployedApplication app = deployed.get(name);
+if (app == null) {
+return 0L;
+}
 
-return app.timestamp;
+return app.timestamp;
+}
 }
 
 
@@ -1305,7 +1307,7 @@ public class HostConfig implements LifecycleListener {
  *  least as long ago as the resolution of the file time stamp
  *  be skipped
  */
-protected synchronized void checkResources(DeployedApplication app,
+protected void checkResources(DeployedApplication app,
 boolean skipFileModificationResolutionCheck) {
 String[] resources =
 app.redeployResources.keySet().toArray(new String[0]);
@@ -1704,57 +1706,59 @@ public class HostConfig implements LifecycleListener {
  * Check for old versions of applications using parallel deployment that 
are
  * now unused (have no active sessions) and undeploy any that are found.
  */
-public synchronized void checkUndeploy() {
-if (deployed.size() < 2) {
-return;
-}
-
-// Need ordered set of names
-SortedSet sortedAppNames = new TreeSet<>(deployed.keySet());
-
-Iterator iter = sortedAppNames.iterator();
-
-ContextName previous = new ContextName(iter.next(), false);
-do {
-ContextName current = new ContextName(iter.next(), false);
+public void checkUndeploy() {
+synchronized (host) {
+if (deployed.size() < 2) {
+return;
+}
 
-if (current.getPath().equals(previous.getPath())) {
-// Current and previous are same path - current will always
-// be a later version
-Context previousContext = (Context) 
host.findChild(previous.getName());
-Context currentContext = (Context) 
host.findChild(current.getName());
-if (previousContext != null && currentContext != null &&
-currentContext.getState().isAvailable() &&
-tryAddServiced(previous.getName())) {
-try {
-Manager manager = previousContext.getManager();
-if (manager != null) {
-int sessionCount;
-if (manager instanceof DistributedManager) {
-sessionCount = ((DistributedManager) 
manager).getActiveSessionsFull();
-} else {
-sessionCount = manager.getActiveSessions();
-}
-if (sessionCount == 0) {
-if (log.isInfoEnabled()) {
-
log.info(sm.getString("hostConfig.undeployVersion", previous.getName()));
+// Need ordered set of names
+SortedSet sortedAppNames = new 
TreeSet<>(deployed.keySet());
+
+Iterator iter = sortedAppNames.iterator();
+
+ContextName previous = new ContextName(iter.next(), false);
+do {
+ContextName current = new ContextName(iter.next(), false);
+
+if (current.getPath().equals(previous.getPath())) {
+// Current and previous are same path - current will always
+// be a later version
+Context previousContext = (Context) 
host.findChild(previous.getName());
+Context currentContext = 

(tomcat) branch 8.5.x updated: Fix sync inconsistency on host config object vs host object

2023-11-20 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 095392c9fc Fix sync inconsistency on host config object vs host object
095392c9fc is described below

commit 095392c9fcc71890807b1a4de7b5ef490dd2f069
Author: remm 
AuthorDate: Mon Nov 20 15:38:39 2023 +0100

Fix sync inconsistency on host config object vs host object

The host object should be used since its lifecycle is relevant.
---
 java/org/apache/catalina/startup/HostConfig.java | 108 ---
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index b451dacfe4..067d4dab58 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -394,13 +394,15 @@ public class HostConfig implements LifecycleListener {
  * @return 0L if no application with that name is deployed, or the instant
  *  on which the application was deployed
  */
-public synchronized long getDeploymentTime(String name) {
-DeployedApplication app = deployed.get(name);
-if (app == null) {
-return 0L;
-}
+public long getDeploymentTime(String name) {
+synchronized (host) {
+DeployedApplication app = deployed.get(name);
+if (app == null) {
+return 0L;
+}
 
-return app.timestamp;
+return app.timestamp;
+}
 }
 
 
@@ -1298,7 +1300,7 @@ public class HostConfig implements LifecycleListener {
  *  least as long ago as the resolution of the file time stamp
  *  be skipped
  */
-protected synchronized void checkResources(DeployedApplication app,
+protected void checkResources(DeployedApplication app,
 boolean skipFileModificationResolutionCheck) {
 String[] resources =
 app.redeployResources.keySet().toArray(new String[0]);
@@ -1697,57 +1699,59 @@ public class HostConfig implements LifecycleListener {
  * Check for old versions of applications using parallel deployment that 
are
  * now unused (have no active sessions) and undeploy any that are found.
  */
-public synchronized void checkUndeploy() {
-if (deployed.size() < 2) {
-return;
-}
-
-// Need ordered set of names
-SortedSet sortedAppNames = new TreeSet<>(deployed.keySet());
-
-Iterator iter = sortedAppNames.iterator();
-
-ContextName previous = new ContextName(iter.next(), false);
-do {
-ContextName current = new ContextName(iter.next(), false);
+public void checkUndeploy() {
+synchronized (host) {
+if (deployed.size() < 2) {
+return;
+}
 
-if (current.getPath().equals(previous.getPath())) {
-// Current and previous are same path - current will always
-// be a later version
-Context previousContext = (Context) 
host.findChild(previous.getName());
-Context currentContext = (Context) 
host.findChild(current.getName());
-if (previousContext != null && currentContext != null &&
-currentContext.getState().isAvailable() &&
-tryAddServiced(previous.getName())) {
-try {
-Manager manager = previousContext.getManager();
-if (manager != null) {
-int sessionCount;
-if (manager instanceof DistributedManager) {
-sessionCount = ((DistributedManager) 
manager).getActiveSessionsFull();
-} else {
-sessionCount = manager.getActiveSessions();
-}
-if (sessionCount == 0) {
-if (log.isInfoEnabled()) {
-
log.info(sm.getString("hostConfig.undeployVersion", previous.getName()));
+// Need ordered set of names
+SortedSet sortedAppNames = new 
TreeSet<>(deployed.keySet());
+
+Iterator iter = sortedAppNames.iterator();
+
+ContextName previous = new ContextName(iter.next(), false);
+do {
+ContextName current = new ContextName(iter.next(), false);
+
+if (current.getPath().equals(previous.getPath())) {
+// Current and previous are same path - current will always
+// be a later version
+Context previousContext = (Context) 
host.findChild(previous.getName());
+Context currentContext = 

(tomcat) branch main updated: Don't wait is a war is not more existing.

2023-11-20 Thread jfclere
This is an automated email from the ASF dual-hosted git repository.

jfclere 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 38d9cc941d Don't wait is a war is not more existing.
38d9cc941d is described below

commit 38d9cc941d890c3cf42bbf642384e7118db6596f
Author: Jean-Frederic Clere 
AuthorDate: Mon Nov 20 15:58:51 2023 +0100

Don't wait is a war is not more existing.
---
 java/org/apache/catalina/startup/HostConfig.java | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index 52e75eeed6..1bdb18f5b5 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1385,10 +1385,13 @@ public class HostConfig implements LifecycleListener {
 } else {
 // There is a chance the the resource was only missing
 // temporarily eg renamed during a text editor save
-try {
-Thread.sleep(500);
-} catch (InterruptedException e1) {
-// Ignore
+if (resource.exists() ||
+
!resource.getName().toLowerCase(Locale.ENGLISH).endsWith(".war")) {
+try {
+Thread.sleep(500);
+} catch (InterruptedException e1) {
+// Ignore
+}
 }
 // Recheck the resource to see if it was really deleted
 if (resource.exists()) {


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



[PR] Bump org.apache.derby:derby from 10.4.2.0 to 10.17.1.0 in /standard-examples [tomcat-taglibs-standard]

2023-11-20 Thread via GitHub


dependabot[bot] opened a new pull request, #8:
URL: https://github.com/apache/tomcat-taglibs-standard/pull/8

   Bumps org.apache.derby:derby from 10.4.2.0 to 10.17.1.0.
   
   
   [![Dependabot compatibility 
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.derby:derby&package-manager=maven&previous-version=10.4.2.0&new-version=10.17.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
   
   Dependabot will resolve any conflicts with this PR as long as you don't 
alter it yourself. You can also trigger a rebase manually by commenting 
`@dependabot rebase`.
   
   [//]: # (dependabot-automerge-start)
   [//]: # (dependabot-automerge-end)
   
   ---
   
   
   Dependabot commands and options
   
   
   You can trigger Dependabot actions by commenting on this PR:
   - `@dependabot rebase` will rebase this PR
   - `@dependabot recreate` will recreate this PR, overwriting any edits that 
have been made to it
   - `@dependabot merge` will merge this PR after your CI passes on it
   - `@dependabot squash and merge` will squash and merge this PR after your CI 
passes on it
   - `@dependabot cancel merge` will cancel a previously requested merge and 
block automerging
   - `@dependabot reopen` will reopen this PR if it is closed
   - `@dependabot close` will close this PR and stop Dependabot recreating it. 
You can achieve the same result by closing it manually
   - `@dependabot show  ignore conditions` will show all of 
the ignore conditions of the specified dependency
   - `@dependabot ignore this major version` will close this PR and stop 
Dependabot creating any more for this major version (unless you reopen the PR 
or upgrade to it yourself)
   - `@dependabot ignore this minor version` will close this PR and stop 
Dependabot creating any more for this minor version (unless you reopen the PR 
or upgrade to it yourself)
   - `@dependabot ignore this dependency` will close this PR and stop 
Dependabot creating any more for this dependency (unless you reopen the PR or 
upgrade to it yourself)
   You can disable automated security fix PRs for this repo from the [Security 
Alerts page](https://github.com/apache/tomcat-taglibs-standard/network/alerts).
   
   


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

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

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


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



(tomcat-taglibs-standard) branch dependabot/maven/standard-examples/org.apache.derby-derby-10.17.1.0 created (now 0eec30c7)

2023-11-20 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/standard-examples/org.apache.derby-derby-10.17.1.0
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git


  at 0eec30c7 Bump org.apache.derby:derby in /standard-examples

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: [PR] Bump derby from 10.4.2.0 to 10.14.2.0 in /standard-examples [tomcat-taglibs-standard]

2023-11-20 Thread via GitHub


dependabot[bot] commented on PR #2:
URL: 
https://github.com/apache/tomcat-taglibs-standard/pull/2#issuecomment-1819973208

   Superseded by #8.


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

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

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


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



Re: [PR] Bump derby from 10.4.2.0 to 10.14.2.0 in /standard-examples [tomcat-taglibs-standard]

2023-11-20 Thread via GitHub


dependabot[bot] closed pull request #2: Bump derby from 10.4.2.0 to 10.14.2.0 
in /standard-examples
URL: https://github.com/apache/tomcat-taglibs-standard/pull/2


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

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

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


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



[PR] Bump org.apache.derby:derby from 10.4.2.0 to 10.17.1.0 in /standard-test [tomcat-taglibs-standard]

2023-11-20 Thread via GitHub


dependabot[bot] opened a new pull request, #9:
URL: https://github.com/apache/tomcat-taglibs-standard/pull/9

   Bumps org.apache.derby:derby from 10.4.2.0 to 10.17.1.0.
   
   
   [![Dependabot compatibility 
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.derby:derby&package-manager=maven&previous-version=10.4.2.0&new-version=10.17.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
   
   Dependabot will resolve any conflicts with this PR as long as you don't 
alter it yourself. You can also trigger a rebase manually by commenting 
`@dependabot rebase`.
   
   [//]: # (dependabot-automerge-start)
   [//]: # (dependabot-automerge-end)
   
   ---
   
   
   Dependabot commands and options
   
   
   You can trigger Dependabot actions by commenting on this PR:
   - `@dependabot rebase` will rebase this PR
   - `@dependabot recreate` will recreate this PR, overwriting any edits that 
have been made to it
   - `@dependabot merge` will merge this PR after your CI passes on it
   - `@dependabot squash and merge` will squash and merge this PR after your CI 
passes on it
   - `@dependabot cancel merge` will cancel a previously requested merge and 
block automerging
   - `@dependabot reopen` will reopen this PR if it is closed
   - `@dependabot close` will close this PR and stop Dependabot recreating it. 
You can achieve the same result by closing it manually
   - `@dependabot show  ignore conditions` will show all of 
the ignore conditions of the specified dependency
   - `@dependabot ignore this major version` will close this PR and stop 
Dependabot creating any more for this major version (unless you reopen the PR 
or upgrade to it yourself)
   - `@dependabot ignore this minor version` will close this PR and stop 
Dependabot creating any more for this minor version (unless you reopen the PR 
or upgrade to it yourself)
   - `@dependabot ignore this dependency` will close this PR and stop 
Dependabot creating any more for this dependency (unless you reopen the PR or 
upgrade to it yourself)
   You can disable automated security fix PRs for this repo from the [Security 
Alerts page](https://github.com/apache/tomcat-taglibs-standard/network/alerts).
   
   


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

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

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


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



Re: [PR] Bump derby from 10.4.2.0 to 10.14.2.0 in /standard-test [tomcat-taglibs-standard]

2023-11-20 Thread via GitHub


dependabot[bot] closed pull request #3: Bump derby from 10.4.2.0 to 10.14.2.0 
in /standard-test
URL: https://github.com/apache/tomcat-taglibs-standard/pull/3


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

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

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


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



(tomcat-taglibs-standard) branch dependabot/maven/standard-examples/org.apache.derby-derby-10.14.2.0 deleted (was 5c6ec24a)

2023-11-20 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/standard-examples/org.apache.derby-derby-10.14.2.0
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git


 was 5c6ec24a Bump derby from 10.4.2.0 to 10.14.2.0 in /standard-examples

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.


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



(tomcat-taglibs-standard) branch dependabot/maven/standard-test/org.apache.derby-derby-10.14.2.0 deleted (was 5061cb2e)

2023-11-20 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/standard-test/org.apache.derby-derby-10.14.2.0
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git


 was 5061cb2e Bump derby from 10.4.2.0 to 10.14.2.0 in /standard-test

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.


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



(tomcat-taglibs-standard) branch dependabot/maven/standard-test/org.apache.derby-derby-10.17.1.0 created (now 4cf4d22e)

2023-11-20 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/standard-test/org.apache.derby-derby-10.17.1.0
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git


  at 4cf4d22e Bump org.apache.derby:derby from 10.4.2.0 to 10.17.1.0 in 
/standard-test

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: [PR] Bump derby from 10.4.2.0 to 10.14.2.0 in /standard-test [tomcat-taglibs-standard]

2023-11-20 Thread via GitHub


dependabot[bot] commented on PR #3:
URL: 
https://github.com/apache/tomcat-taglibs-standard/pull/3#issuecomment-1819973270

   Superseded by #9.


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

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

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


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