[GitHub] [tomcat] aooohan commented on a diff in pull request #597: Use a deep copy of query stats whose values won't change during sorting.
aooohan commented on code in PR #597:
URL: https://github.com/apache/tomcat/pull/597#discussion_r1282608560
##
modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java:
##
@@ -222,19 +222,55 @@ protected QueryStats getQueryStats(String sql) {
return qs;
}
+static class MiniQueryStats {
+public final QueryStats queryStats;
+public final long lastInvocation;
+
+public MiniQueryStats(QueryStats queryStats) {
+this.queryStats = queryStats;
+this.lastInvocation = queryStats.lastInvocation;
+}
+}
+
+static class MiniQueryStatsComparator implements Comparator
+{
+@Override
+public int compare(MiniQueryStats stats1, MiniQueryStats stats2) {
+return Long.compare(handleZero(stats1.lastInvocation),
+handleZero(stats2.lastInvocation));
+}
+
+private static long handleZero(long value) {
+return value == 0 ? Long.MAX_VALUE : value;
+}
+}
+
+private MiniQueryStatsComparator miniQueryStatsComparator = new
MiniQueryStatsComparator();
+
/**
* Sort QueryStats by last invocation time
* @param queries The queries map
*/
protected void removeOldest(ConcurrentHashMap queries) {
-ArrayList list = new ArrayList<>(queries.values());
-Collections.sort(list, queryStatsComparator);
+// Make a defensive deep-copy of the query stats list to prevent
+// concurrent changes to the lastModified member during list-sort
+ArrayList list = new ArrayList<>(queries.size());
+for(QueryStats stats : queries.values()) {
+list.add(new MiniQueryStats(stats));
+}
+
+Collections.sort(list, miniQueryStatsComparator);
int removeIndex = 0;
while (queries.size() > maxQueries) {
-String sql = list.get(removeIndex).getQuery();
-queries.remove(sql);
-if (log.isDebugEnabled()) {
- log.debug("Removing slow query, capacity reached:"+sql);
+MiniQueryStats mqs = list.get(removeIndex);
+// Check to see if the lastInvocation has been updated since we
+// took our snapshot. If the timestamps disagree, it means
+// that this item is no longer the oldest (and it likely now
+// one of the newest).
+if(mqs.lastInvocation == mqs.queryStats.lastInvocation) {
Review Comment:
Maybe use `PriorityQueue` instead of `ArrayList` is a better way? The
latter will not have the problem of `removeIndex` being too high. See below:
```java
protected void removeOldest(ConcurrentHashMap queries) {
int removeCount = queries.size() - maxQueries;
if (removeCount <= 0) {
return;
}
// Make a defensive deep-copy of the query stats list to prevent
// concurrent changes to the lastModified member during list-sort
PriorityQueue queue = new
PriorityQueue<>(queries.size(), miniQueryStatsComparator);
for(QueryStats stats : queries.values()) {
queue.offer(new MiniQueryStats(stats));
}
while (removeCount > 0 && !queue.isEmpty()) {
MiniQueryStats mqs = queue.poll();
// Check to see if the lastInvocation has been updated since we
// took our snapshot. If the timestamps disagree, it means
// that this item is no longer the oldest (and it likely now
// one of the newest).
if(mqs.lastInvocation == mqs.queryStats.lastInvocation) {
String sql = mqs.queryStats.query;
queries.remove(sql);
removeCount--;
if (log.isDebugEnabled()) log.debug("Removing slow query,
capacity reached:"+sql);
}
}
}
```
--
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 8.5.x updated: Fix the inconsistent state of ConnectionState
This is an automated email from the ASF dual-hosted git repository.
lihan 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 5375dc1e84 Fix the inconsistent state of ConnectionState
5375dc1e84 is described below
commit 5375dc1e841c3dd656258a5016001d4068eb244c
Author: lihan
AuthorDate: Thu Aug 3 10:11:36 2023 +0800
Fix the inconsistent state of ConnectionState
(cherry picked from commit 77dcb33743d394e158aae1d538f94aaed1edd6ae)
---
.../jdbc/pool/interceptor/ConnectionState.java | 27 +---
.../tomcat/jdbc/test/TestConnectionState.java | 72 ++
webapps/docs/changelog.xml | 9 +++
3 files changed, 101 insertions(+), 7 deletions(-)
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
index dac5463c8f..fdc64fba3b 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
@@ -155,14 +155,27 @@ public class ConnectionState extends JdbcInterceptor {
}
}
-result = super.invoke(proxy, method, args);
-if (read || write) {
-switch (index) {
-case 0:{autoCommit = (Boolean) (read?result:args[0]); break;}
-case 1:{transactionIsolation = (Integer)(read?result:args[0]);
break;}
-case 2:{readOnly = (Boolean)(read?result:args[0]); break;}
-case 3:{catalog = (String)(read?result:args[0]); break;}
+try {
+result = super.invoke(proxy, method, args);
+if (read || write) {
+switch (index) {
+case 0:{autoCommit = (Boolean) (read?result:args[0]);
break;}
+case 1:{transactionIsolation =
(Integer)(read?result:args[0]); break;}
+case 2:{readOnly = (Boolean)(read?result:args[0]); break;}
+case 3:{catalog = (String)(read?result:args[0]); break;}
+}
+}
+} catch (Throwable e) {
+if (write) {
+log.warn("Reset state to null as an exception occurred while
calling method[" + name + "].", e);
+switch (index) {
+case 0:{autoCommit = null; break;}
+case 1:{transactionIsolation = null; break;}
+case 2:{readOnly = null; break;}
+case 3:{catalog = null; break;}
+}
}
+throw e;
}
return result;
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
index daa8ea4967..73e1044b9f 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
@@ -17,13 +17,19 @@
package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+import org.apache.tomcat.jdbc.test.driver.Driver;
import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.jdbc.pool.DataSourceProxy;
import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
+import javax.sql.PooledConnection;
+
public class TestConnectionState extends DefaultTestCase {
@Test
@@ -79,4 +85,70 @@ public class TestConnectionState extends DefaultTestCase {
c1 = d1.getConnection();
Assert.assertEquals("Catalog should be
information_schema",c1.getCatalog(),"information_schema");
}
+
+@Test
+public void testWithException() throws SQLException {
+DriverManager.registerDriver(new MockErrorDriver());
+// use our mock driver
+datasource.setDriverClassName(MockErrorDriver.class.getName());
+datasource.setUrl(MockErrorDriver.url);
+datasource.setDefaultAutoCommit(true);
+datasource.setMinIdle(1);
+datasource.setMaxIdle(1);
+datasource.setMaxActive(1);
+datasource.setJdbcInterceptors(ConnectionState.class.getName());
+Connection connection = datasource.getConnection();
+PooledConnection pc = (PooledConnection) connection;
+MockErrorConnection c1 = (MockErrorConnection) pc.getConnection();
+Assert.assertTrue("Auto commit should be true", c1.getAutoCommit());
+connection.close();
+c1.setThrowError(true);
+Connection c2 = datasource.getConnection();
+try {
+c2.setAutoCommit(false);
+} catch
[tomcat] branch 9.0.x updated: Fix the inconsistent state of ConnectionState
This is an automated email from the ASF dual-hosted git repository.
lihan 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 5e39cd81d3 Fix the inconsistent state of ConnectionState
5e39cd81d3 is described below
commit 5e39cd81d3fa0d084a4dec41b187967999ebc639
Author: lihan
AuthorDate: Thu Aug 3 10:11:36 2023 +0800
Fix the inconsistent state of ConnectionState
(cherry picked from commit 77dcb33743d394e158aae1d538f94aaed1edd6ae)
---
.../jdbc/pool/interceptor/ConnectionState.java | 27 +---
.../tomcat/jdbc/test/TestConnectionState.java | 72 ++
webapps/docs/changelog.xml | 9 +++
3 files changed, 101 insertions(+), 7 deletions(-)
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
index dac5463c8f..fdc64fba3b 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
@@ -155,14 +155,27 @@ public class ConnectionState extends JdbcInterceptor {
}
}
-result = super.invoke(proxy, method, args);
-if (read || write) {
-switch (index) {
-case 0:{autoCommit = (Boolean) (read?result:args[0]); break;}
-case 1:{transactionIsolation = (Integer)(read?result:args[0]);
break;}
-case 2:{readOnly = (Boolean)(read?result:args[0]); break;}
-case 3:{catalog = (String)(read?result:args[0]); break;}
+try {
+result = super.invoke(proxy, method, args);
+if (read || write) {
+switch (index) {
+case 0:{autoCommit = (Boolean) (read?result:args[0]);
break;}
+case 1:{transactionIsolation =
(Integer)(read?result:args[0]); break;}
+case 2:{readOnly = (Boolean)(read?result:args[0]); break;}
+case 3:{catalog = (String)(read?result:args[0]); break;}
+}
+}
+} catch (Throwable e) {
+if (write) {
+log.warn("Reset state to null as an exception occurred while
calling method[" + name + "].", e);
+switch (index) {
+case 0:{autoCommit = null; break;}
+case 1:{transactionIsolation = null; break;}
+case 2:{readOnly = null; break;}
+case 3:{catalog = null; break;}
+}
}
+throw e;
}
return result;
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
index daa8ea4967..73e1044b9f 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
@@ -17,13 +17,19 @@
package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+import org.apache.tomcat.jdbc.test.driver.Driver;
import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.jdbc.pool.DataSourceProxy;
import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
+import javax.sql.PooledConnection;
+
public class TestConnectionState extends DefaultTestCase {
@Test
@@ -79,4 +85,70 @@ public class TestConnectionState extends DefaultTestCase {
c1 = d1.getConnection();
Assert.assertEquals("Catalog should be
information_schema",c1.getCatalog(),"information_schema");
}
+
+@Test
+public void testWithException() throws SQLException {
+DriverManager.registerDriver(new MockErrorDriver());
+// use our mock driver
+datasource.setDriverClassName(MockErrorDriver.class.getName());
+datasource.setUrl(MockErrorDriver.url);
+datasource.setDefaultAutoCommit(true);
+datasource.setMinIdle(1);
+datasource.setMaxIdle(1);
+datasource.setMaxActive(1);
+datasource.setJdbcInterceptors(ConnectionState.class.getName());
+Connection connection = datasource.getConnection();
+PooledConnection pc = (PooledConnection) connection;
+MockErrorConnection c1 = (MockErrorConnection) pc.getConnection();
+Assert.assertTrue("Auto commit should be true", c1.getAutoCommit());
+connection.close();
+c1.setThrowError(true);
+Connection c2 = datasource.getConnection();
+try {
+c2.setAutoCommit(false);
+} catch
[tomcat] branch 10.1.x updated: Fix the inconsistent state of ConnectionState
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 7d73d88dd5 Fix the inconsistent state of ConnectionState
7d73d88dd5 is described below
commit 7d73d88dd5f67ce3f34e332c3bf75ce2e3ec29ef
Author: lihan
AuthorDate: Thu Aug 3 10:11:36 2023 +0800
Fix the inconsistent state of ConnectionState
(cherry picked from commit 77dcb33743d394e158aae1d538f94aaed1edd6ae)
---
.../jdbc/pool/interceptor/ConnectionState.java | 27 +---
.../tomcat/jdbc/test/TestConnectionState.java | 72 ++
webapps/docs/changelog.xml | 9 +++
3 files changed, 101 insertions(+), 7 deletions(-)
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
index dac5463c8f..fdc64fba3b 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
@@ -155,14 +155,27 @@ public class ConnectionState extends JdbcInterceptor {
}
}
-result = super.invoke(proxy, method, args);
-if (read || write) {
-switch (index) {
-case 0:{autoCommit = (Boolean) (read?result:args[0]); break;}
-case 1:{transactionIsolation = (Integer)(read?result:args[0]);
break;}
-case 2:{readOnly = (Boolean)(read?result:args[0]); break;}
-case 3:{catalog = (String)(read?result:args[0]); break;}
+try {
+result = super.invoke(proxy, method, args);
+if (read || write) {
+switch (index) {
+case 0:{autoCommit = (Boolean) (read?result:args[0]);
break;}
+case 1:{transactionIsolation =
(Integer)(read?result:args[0]); break;}
+case 2:{readOnly = (Boolean)(read?result:args[0]); break;}
+case 3:{catalog = (String)(read?result:args[0]); break;}
+}
+}
+} catch (Throwable e) {
+if (write) {
+log.warn("Reset state to null as an exception occurred while
calling method[" + name + "].", e);
+switch (index) {
+case 0:{autoCommit = null; break;}
+case 1:{transactionIsolation = null; break;}
+case 2:{readOnly = null; break;}
+case 3:{catalog = null; break;}
+}
}
+throw e;
}
return result;
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
index daa8ea4967..73e1044b9f 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
@@ -17,13 +17,19 @@
package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+import org.apache.tomcat.jdbc.test.driver.Driver;
import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.jdbc.pool.DataSourceProxy;
import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
+import javax.sql.PooledConnection;
+
public class TestConnectionState extends DefaultTestCase {
@Test
@@ -79,4 +85,70 @@ public class TestConnectionState extends DefaultTestCase {
c1 = d1.getConnection();
Assert.assertEquals("Catalog should be
information_schema",c1.getCatalog(),"information_schema");
}
+
+@Test
+public void testWithException() throws SQLException {
+DriverManager.registerDriver(new MockErrorDriver());
+// use our mock driver
+datasource.setDriverClassName(MockErrorDriver.class.getName());
+datasource.setUrl(MockErrorDriver.url);
+datasource.setDefaultAutoCommit(true);
+datasource.setMinIdle(1);
+datasource.setMaxIdle(1);
+datasource.setMaxActive(1);
+datasource.setJdbcInterceptors(ConnectionState.class.getName());
+Connection connection = datasource.getConnection();
+PooledConnection pc = (PooledConnection) connection;
+MockErrorConnection c1 = (MockErrorConnection) pc.getConnection();
+Assert.assertTrue("Auto commit should be true", c1.getAutoCommit());
+connection.close();
+c1.setThrowError(true);
+Connection c2 = datasource.getConnection();
+try {
+c2.setAutoCommit(false);
+} catch
[GitHub] [tomcat] aooohan closed pull request #643: Fix ConnectionState when exception
aooohan closed pull request #643: Fix ConnectionState when exception URL: https://github.com/apache/tomcat/pull/643 -- 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
[GitHub] [tomcat] aooohan commented on pull request #643: Fix ConnectionState when exception
aooohan commented on PR #643: URL: https://github.com/apache/tomcat/pull/643#issuecomment-1663197316 Thanks for the PR. I have merged manually with adding a unit test and changelog entry. -- 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 the inconsistent state of ConnectionState
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 77dcb33743 Fix the inconsistent state of ConnectionState
77dcb33743 is described below
commit 77dcb33743d394e158aae1d538f94aaed1edd6ae
Author: lihan
AuthorDate: Thu Aug 3 10:11:36 2023 +0800
Fix the inconsistent state of ConnectionState
---
.../jdbc/pool/interceptor/ConnectionState.java | 27 +---
.../tomcat/jdbc/test/TestConnectionState.java | 72 ++
webapps/docs/changelog.xml | 9 +++
3 files changed, 101 insertions(+), 7 deletions(-)
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
index dac5463c8f..fdc64fba3b 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
@@ -155,14 +155,27 @@ public class ConnectionState extends JdbcInterceptor {
}
}
-result = super.invoke(proxy, method, args);
-if (read || write) {
-switch (index) {
-case 0:{autoCommit = (Boolean) (read?result:args[0]); break;}
-case 1:{transactionIsolation = (Integer)(read?result:args[0]);
break;}
-case 2:{readOnly = (Boolean)(read?result:args[0]); break;}
-case 3:{catalog = (String)(read?result:args[0]); break;}
+try {
+result = super.invoke(proxy, method, args);
+if (read || write) {
+switch (index) {
+case 0:{autoCommit = (Boolean) (read?result:args[0]);
break;}
+case 1:{transactionIsolation =
(Integer)(read?result:args[0]); break;}
+case 2:{readOnly = (Boolean)(read?result:args[0]); break;}
+case 3:{catalog = (String)(read?result:args[0]); break;}
+}
+}
+} catch (Throwable e) {
+if (write) {
+log.warn("Reset state to null as an exception occurred while
calling method[" + name + "].", e);
+switch (index) {
+case 0:{autoCommit = null; break;}
+case 1:{transactionIsolation = null; break;}
+case 2:{readOnly = null; break;}
+case 3:{catalog = null; break;}
+}
}
+throw e;
}
return result;
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
index daa8ea4967..73e1044b9f 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
@@ -17,13 +17,19 @@
package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+import org.apache.tomcat.jdbc.test.driver.Driver;
import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.jdbc.pool.DataSourceProxy;
import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
+import javax.sql.PooledConnection;
+
public class TestConnectionState extends DefaultTestCase {
@Test
@@ -79,4 +85,70 @@ public class TestConnectionState extends DefaultTestCase {
c1 = d1.getConnection();
Assert.assertEquals("Catalog should be
information_schema",c1.getCatalog(),"information_schema");
}
+
+@Test
+public void testWithException() throws SQLException {
+DriverManager.registerDriver(new MockErrorDriver());
+// use our mock driver
+datasource.setDriverClassName(MockErrorDriver.class.getName());
+datasource.setUrl(MockErrorDriver.url);
+datasource.setDefaultAutoCommit(true);
+datasource.setMinIdle(1);
+datasource.setMaxIdle(1);
+datasource.setMaxActive(1);
+datasource.setJdbcInterceptors(ConnectionState.class.getName());
+Connection connection = datasource.getConnection();
+PooledConnection pc = (PooledConnection) connection;
+MockErrorConnection c1 = (MockErrorConnection) pc.getConnection();
+Assert.assertTrue("Auto commit should be true", c1.getAutoCommit());
+connection.close();
+c1.setThrowError(true);
+Connection c2 = datasource.getConnection();
+try {
+c2.setAutoCommit(false);
+} catch (SQLException e) {
+// ignore
+}
+Assert.assertFalse("Auto
Buildbot success in on tomcat-8.5.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/561 Blamelist: Mark Thomas , dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 8.5.x] 42902520f74fb05e1fed3fdc3f75ce65f003e04f Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF 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-10.1.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/887 Blamelist: Mark Thomas , dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] 12d1596a037fa62d282d5730ea60f56086ba105f Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF 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-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/504 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] 347767a1f0c353012250cac05368297e4bc7c99c Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - 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: Sigh. 3rd time's the charm. Use the correct hashes.
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 42902520f7 Sigh. 3rd time's the charm. Use the correct hashes.
42902520f7 is described below
commit 42902520f74fb05e1fed3fdc3f75ce65f003e04f
Author: Mark Thomas
AuthorDate: Wed Aug 2 17:45:47 2023 +0100
Sigh. 3rd time's the charm. Use the correct hashes.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 62e0f4cb21..0d1c70f641 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -185,7 +185,7 @@
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-nativ
nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=d0d9ebe60bc2507014a0c1c2fb0e25f2|7b61e72912248d06bbe511997fc734f6839ff4f8
+nsis.checksum.value=2953f6074bcc4711b439a666eafbb91b|586855a743a6e0ade203d8758af303a48ee0716b
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
-
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: Sigh. 3rd time's the charm. Use the correct hashes.
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 db3e1aacd3 Sigh. 3rd time's the charm. Use the correct hashes.
db3e1aacd3 is described below
commit db3e1aacd3f23508a7350aebbaf5dd0e93daf59f
Author: Mark Thomas
AuthorDate: Wed Aug 2 17:45:47 2023 +0100
Sigh. 3rd time's the charm. Use the correct hashes.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 95cc50367f..bbbc9c33c4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -181,7 +181,7 @@
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-nativ
nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=d0d9ebe60bc2507014a0c1c2fb0e25f2|7b61e72912248d06bbe511997fc734f6839ff4f8
+nsis.checksum.value=2953f6074bcc4711b439a666eafbb91b|586855a743a6e0ade203d8758af303a48ee0716b
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Sigh. 3rd time's the charm. Use the correct hashes.
This is an automated email from the ASF dual-hosted git repository.
markt 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 12d1596a03 Sigh. 3rd time's the charm. Use the correct hashes.
12d1596a03 is described below
commit 12d1596a037fa62d282d5730ea60f56086ba105f
Author: Mark Thomas
AuthorDate: Wed Aug 2 17:45:47 2023 +0100
Sigh. 3rd time's the charm. Use the correct hashes.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 18acf88307..7214f4b52f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -179,7 +179,7 @@
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-nativ
nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=d0d9ebe60bc2507014a0c1c2fb0e25f2|7b61e72912248d06bbe511997fc734f6839ff4f8
+nsis.checksum.value=2953f6074bcc4711b439a666eafbb91b|586855a743a6e0ade203d8758af303a48ee0716b
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Sigh. 3rd time's the charm. Use the correct hashes.
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 347767a1f0 Sigh. 3rd time's the charm. Use the correct hashes.
347767a1f0 is described below
commit 347767a1f0c353012250cac05368297e4bc7c99c
Author: Mark Thomas
AuthorDate: Wed Aug 2 17:45:47 2023 +0100
Sigh. 3rd time's the charm. Use the correct hashes.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index b29d2c1de6..4c30876a74 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -158,7 +158,7 @@
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-nativ
nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=d0d9ebe60bc2507014a0c1c2fb0e25f2|7b61e72912248d06bbe511997fc734f6839ff4f8
+nsis.checksum.value=2953f6074bcc4711b439a666eafbb91b|586855a743a6e0ade203d8758af303a48ee0716b
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
-
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: Back-port translation improvements.
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 9520b0fbbb Back-port translation improvements.
9520b0fbbb is described below
commit 9520b0fbbb5b8bef1554d32ac82d97334db5187e
Author: Mark Thomas
AuthorDate: Wed Aug 2 17:19:00 2023 +0100
Back-port translation improvements.
---
.../org/apache/catalina/core/LocalStrings_fr.properties | 9 +
.../org/apache/catalina/core/LocalStrings_ja.properties | 17 +
.../apache/catalina/filters/LocalStrings_fr.properties | 2 +-
.../apache/catalina/valves/LocalStrings_fr.properties | 4
.../apache/catalina/valves/LocalStrings_ja.properties | 4
java/org/apache/naming/LocalStrings_ja.properties | 2 +-
.../tomcat/util/compat/LocalStrings_fr.properties | 1 +
.../tomcat/util/compat/LocalStrings_ja.properties | 1 +
.../tomcat/util/compat/LocalStrings_ko.properties | 1 +
.../tomcat/util/compat/LocalStrings_zh_CN.properties| 1 +
.../apache/tomcat/util/net/LocalStrings_ja.properties | 4 ++--
.../tomcat/util/threads/LocalStrings_ja.properties | 4 ++--
webapps/docs/changelog.xml | 7 +++
13 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 74d85ff818..e8e0622121 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -127,6 +127,8 @@ containerBase.realm.stop=Erreur lors de l'arrêt de l'ancien
royaume
containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son
démarrage
containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
+contextNamingInfoListener.envEntry=Ajout de l''entrée d''environnement de
contexte [{0}] avec la valeur [{1}]
+
defaultInstanceManager.invalidAnnotation=L''annotation [{0}] est invalide
defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection
d'une ressource méthode
defaultInstanceManager.postConstructNotFound=La méthode post construct [{0}]
de la classe [{1}] est déclarée dans le descripteur de déploiement mais n''a
pas été trouvée
@@ -153,6 +155,7 @@ jreLeakListener.jarUrlConnCacheFail=Échec de la
désactivation du cache par dé
jreLeakListener.ldapPoolManagerFail=Echec de la création de la classe
com.sun.jndi.ldap.LdapPoolManager durant le démarrage de Tomcat pour éviter une
fuite de mémoire, cela est normal sur toutes les JVMs non Oracle
jreLeakListener.xmlParseFail=Erreur en essayant de prévenir une fuite de
mémoire lors du traitement de contenu XML
+listener.notContext=Cet écouteur doit être uniquement inclus à l''intérieur
d''éléments Context mais est dans [{0}]
listener.notServer=Ce listener ne peut être ajouté qu''à des éléments Server,
mais est dans [{0}]
naming.addEnvEntry=Ajout de l''entrée d''environnement [{0}]
@@ -167,6 +170,12 @@ naming.wsdlFailed=fichier wsdl [{0}] non trouvé
noPluggabilityServletContext.notAllowed=La section 4.4 de la spécification
Servlet 3.0 ne permet pas à cette méthode d'être appelée à partir d'un
ServletContextListener qui n'a pas été déclaré dans web.xml, un
web-fragment.xml, ou annoté avec @WebListener
+propertiesRoleMappingListener.linkedRole=Le rôle de l''application [{0}] a été
associé avec succès au rôle [{1}]
+propertiesRoleMappingListener.linkedRoleCount=[{0}] rôles de l''application
ont été associés à des rôles
+propertiesRoleMappingListener.roleMappingFileEmpty=Le fichier d'association de
rôles ne peut être vide
+propertiesRoleMappingListener.roleMappingFileFail=Erreur de chargement du
fichier d''association de rôles [{0}]
+propertiesRoleMappingListener.roleMappingFileNull=Le fichier d'association de
rôles ne peut être null
+
pushBuilder.noPath=Il est interdit d'appeler push() avant de fixer un chemin
standardContext.applicationListener=Erreur lors de la configuration de la
classe d''écoute de l''application (application listener) [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index e3e1e31c8f..057dac8cef 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -127,6 +127,8 @@ containerBase.realm.stop=古いRealmを停止できません。
containerBase.threadedStartFailed=子コンテナーを開始できません。
containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
+contextNamingInfoListener.envEntry=コンテキスト環境エントリ [{0}] を値 [{1}] で追加しています
+
defaultInstanceManager.invalidAnnotation=無効なアノテーション [{0}]
defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです
defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の
post-construct メソッド [{0}]
[tomcat] branch 10.1.x updated: Backport translation updates
This is an automated email from the ASF dual-hosted git repository.
markt 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 5e7d6048e1 Backport translation updates
5e7d6048e1 is described below
commit 5e7d6048e1003decdd8cc0225934f7f49fc28a9e
Author: Mark Thomas
AuthorDate: Wed Aug 2 17:12:24 2023 +0100
Backport translation updates
---
.../org/apache/catalina/core/LocalStrings_fr.properties | 9 +
.../org/apache/catalina/core/LocalStrings_ja.properties | 17 +
.../apache/catalina/filters/LocalStrings_fr.properties | 2 +-
.../catalina/tribes/group/LocalStrings_ja.properties| 2 +-
.../apache/catalina/valves/LocalStrings_fr.properties | 4
.../apache/catalina/valves/LocalStrings_ja.properties | 4
java/org/apache/naming/LocalStrings_ja.properties | 2 +-
.../apache/tomcat/util/net/LocalStrings_ja.properties | 6 +++---
.../tomcat/util/threads/LocalStrings_ja.properties | 4 ++--
webapps/docs/changelog.xml | 7 +++
10 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 026c10fd56..b5a52542e5 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -124,6 +124,8 @@ containerBase.realm.stop=Erreur lors de l'arrêt de l'ancien
royaume
containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son
démarrage
containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
+contextNamingInfoListener.envEntry=Ajout de l''entrée d''environnement de
contexte [{0}] avec la valeur [{1}]
+
defaultInstanceManager.invalidAnnotation=L''annotation [{0}] est invalide
defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection
d'une ressource méthode
defaultInstanceManager.postConstructNotFound=La méthode post construct [{0}]
de la classe [{1}] est déclarée dans le descripteur de déploiement mais n''a
pas été trouvée
@@ -145,6 +147,7 @@ jniLifecycleListener.missingPathOrName=Soit libraryName
soit libraryPath doivent
jreLeakListener.classToInitializeFail=Echec du chargement de la classe [{0}]
pendant le démarrage de Tomcat, effectué pour empêcher de possibles fuites de
mémoire
+listener.notContext=Cet écouteur doit être uniquement inclus à l''intérieur
d''éléments Context mais est dans [{0}]
listener.notServer=Ce listener ne peut être ajouté qu''à des éléments Server,
mais est dans [{0}]
naming.addEnvEntry=Ajout de l''entrée d''environnement [{0}]
@@ -159,6 +162,12 @@ naming.wsdlFailed=fichier wsdl [{0}] non trouvé
noPluggabilityServletContext.notAllowed=La section 4.4 de la spécification
Servlet 3.0 ne permet pas à cette méthode d'être appelée à partir d'un
ServletContextListener qui n'a pas été déclaré dans web.xml, un
web-fragment.xml, ou annoté avec @WebListener
+propertiesRoleMappingListener.linkedRole=Le rôle de l''application [{0}] a été
associé avec succès au rôle [{1}]
+propertiesRoleMappingListener.linkedRoleCount=[{0}] rôles de l''application
ont été associés à des rôles
+propertiesRoleMappingListener.roleMappingFileEmpty=Le fichier d'association de
rôles ne peut être vide
+propertiesRoleMappingListener.roleMappingFileFail=Erreur de chargement du
fichier d''association de rôles [{0}]
+propertiesRoleMappingListener.roleMappingFileNull=Le fichier d'association de
rôles ne peut être null
+
pushBuilder.noPath=Il est interdit d'appeler push() avant de fixer un chemin
standardContext.applicationListener=Erreur lors de la configuration de la
classe d''écoute de l''application (application listener) [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index ad23006ede..6e3757ffd0 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -124,6 +124,8 @@ containerBase.realm.stop=古いRealmを停止できません。
containerBase.threadedStartFailed=子コンテナーを開始できません。
containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
+contextNamingInfoListener.envEntry=コンテキスト環境エントリ [{0}] を値 [{1}] で追加しています
+
defaultInstanceManager.invalidAnnotation=無効なアノテーション [{0}]
defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです
defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の
post-construct メソッド [{0}] が見つかりません
@@ -145,9 +147,10 @@ jniLifecycleListener.missingPathOrName=libraryName あるいは
libraryPath を
jreLeakListener.classToInitializeFail=Tomcat起動中に可能なメモリーリークを防止するためのクラス [{0}]
をロードすることに失敗しました。
+listener.notContext=このリスナーは Context 要素内でのみネストしなければなりませんが、[{0}] 内にあります。
listener.notServer=このlistenerはServer要素内にのみネストする必要がありますが、[{0}] にあります。
-naming.addEnvEntry=環境変数
[tomcat] 01/02: Improvements to French translations. (remm)
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
commit 93238fe02fd8737dcb5e9d4df0ca8cb3804b768d
Author: Mark Thomas
AuthorDate: Wed Aug 2 17:03:23 2023 +0100
Improvements to French translations. (remm)
---
java/org/apache/catalina/core/LocalStrings_fr.properties| 9 +
java/org/apache/catalina/filters/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings_fr.properties | 4
webapps/docs/changelog.xml | 3 +++
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index cb5ca9e3ab..f77785045b 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -124,6 +124,8 @@ containerBase.realm.stop=Erreur lors de l'arrêt de l'ancien
royaume
containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son
démarrage
containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
+contextNamingInfoListener.envEntry=Ajout de l''entrée d''environnement de
contexte [{0}] avec la valeur [{1}]
+
defaultInstanceManager.invalidAnnotation=L''annotation [{0}] est invalide
defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection
d'une ressource méthode
defaultInstanceManager.postConstructNotFound=La méthode post construct [{0}]
de la classe [{1}] est déclarée dans le descripteur de déploiement mais n''a
pas été trouvée
@@ -145,6 +147,7 @@ jniLifecycleListener.missingPathOrName=Soit libraryName
soit libraryPath doivent
jreLeakListener.classToInitializeFail=Echec du chargement de la classe [{0}]
pendant le démarrage de Tomcat, effectué pour empêcher de possibles fuites de
mémoire
+listener.notContext=Cet écouteur doit être uniquement inclus à l''intérieur
d''éléments Context mais est dans [{0}]
listener.notServer=Ce listener ne peut être ajouté qu''à des éléments Server,
mais est dans [{0}]
naming.addEnvEntry=Ajout de l''entrée d''environnement [{0}]
@@ -159,6 +162,12 @@ naming.wsdlFailed=fichier wsdl [{0}] non trouvé
noPluggabilityServletContext.notAllowed=La section 4.4 de la spécification
Servlet 3.0 ne permet pas à cette méthode d'être appelée à partir d'un
ServletContextListener qui n'a pas été déclaré dans web.xml, un
web-fragment.xml, ou annoté avec @WebListener
+propertiesRoleMappingListener.linkedRole=Le rôle de l''application [{0}] a été
associé avec succès au rôle [{1}]
+propertiesRoleMappingListener.linkedRoleCount=[{0}] rôles de l''application
ont été associés à des rôles
+propertiesRoleMappingListener.roleMappingFileEmpty=Le fichier d'association de
rôles ne peut être vide
+propertiesRoleMappingListener.roleMappingFileFail=Erreur de chargement du
fichier d''association de rôles [{0}]
+propertiesRoleMappingListener.roleMappingFileNull=Le fichier d'association de
rôles ne peut être null
+
pushBuilder.noPath=Il est interdit d'appeler push() avant de fixer un chemin
standardContext.applicationListener=Erreur lors de la configuration de la
classe d''écoute de l''application (application listener) [{0}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index 3f5f4a041d..558f69d197 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -52,7 +52,7 @@ http.403=L''accès à la ressource demandée [{0}] a été
interdit.
httpHeaderSecurityFilter.clickjack.invalid=Une valeur invalide [{0}] a été
spécifiée pour le header "anti click-jacking"
httpHeaderSecurityFilter.committed=Impossible d'ajouter les en-têtes HTTP car
la réponse a déjà été envoyée avant l'invocation du filtre de sécurité des
en-têtes
-rateLimitFilter.initialized=RateLimitFilter [{0}] initialisé avec [{1}]
requêtes toutes les [{2}] secondes. Fixé à [{3}] toutes les [{4}]
millisecondes. [{5}].
+rateLimitFilter.initialized=RateLimitFilter [{0}] initialisé avec [{1}]
requêtes toutes les [{2}] secondes. Fixé à [{3}] toutes les [{4}] secondes.
[{5}].
rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] requêtes de [{2}] ont excédé
le maximum autorisé de [{3}] pour une période de [{4}] secondes.
remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}],
voir les précédents messages pour les détails
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index bd6068ff49..c1b852c558 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -128,7 +128,11 @@ http.511.reason=L’authentification du réseau est nécessaire
[tomcat] branch main updated (3769825a84 -> 9f096f9619)
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.git from 3769825a84 Need zip checksums, not exe checksums new 93238fe02f Improvements to French translations. (remm) new 9f096f9619 Improvements to Japanese translations. 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: .../org/apache/catalina/core/LocalStrings_fr.properties | 9 + .../org/apache/catalina/core/LocalStrings_ja.properties | 17 + .../apache/catalina/filters/LocalStrings_fr.properties | 2 +- .../catalina/tribes/group/LocalStrings_ja.properties| 2 +- .../apache/catalina/valves/LocalStrings_fr.properties | 4 .../apache/catalina/valves/LocalStrings_ja.properties | 4 java/org/apache/naming/LocalStrings_ja.properties | 2 +- .../apache/tomcat/util/net/LocalStrings_ja.properties | 6 +++--- .../tomcat/util/threads/LocalStrings_ja.properties | 4 ++-- webapps/docs/changelog.xml | 7 +++ 10 files changed, 45 insertions(+), 12 deletions(-) - 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: Need zip checksums, not exe checksums
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 62f9021b0e Need zip checksums, not exe checksums
62f9021b0e is described below
commit 62f9021b0e88672a9699ff7b5d50116a9a14c2e2
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:49:48 2023 +0100
Need zip checksums, not exe checksums
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 9977c437e5..62e0f4cb21 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -185,7 +185,7 @@
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-nativ
nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=dc6015c4ca2bcfd1a2b7f315ddf99922|0322ebc9ddef97ca66762319df79032b63fbf1f2
+nsis.checksum.value=d0d9ebe60bc2507014a0c1c2fb0e25f2|7b61e72912248d06bbe511997fc734f6839ff4f8
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
-
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: Need zip checksums, not exe checksums
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 0dcf920adb Need zip checksums, not exe checksums
0dcf920adb is described below
commit 0dcf920adbe63d78bf9bafc97cb9961487497e96
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:49:48 2023 +0100
Need zip checksums, not exe checksums
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 61066f5ba0..95cc50367f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -181,7 +181,7 @@
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-nativ
nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=dc6015c4ca2bcfd1a2b7f315ddf99922|0322ebc9ddef97ca66762319df79032b63fbf1f2
+nsis.checksum.value=d0d9ebe60bc2507014a0c1c2fb0e25f2|7b61e72912248d06bbe511997fc734f6839ff4f8
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Need zip checksums, not exe checksums
This is an automated email from the ASF dual-hosted git repository.
markt 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 858e419344 Need zip checksums, not exe checksums
858e419344 is described below
commit 858e41934480e69741db0f48b661330f6fea7c81
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:49:48 2023 +0100
Need zip checksums, not exe checksums
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index e5d80d8662..18acf88307 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -179,7 +179,7 @@
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-nativ
nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=dc6015c4ca2bcfd1a2b7f315ddf99922|0322ebc9ddef97ca66762319df79032b63fbf1f2
+nsis.checksum.value=d0d9ebe60bc2507014a0c1c2fb0e25f2|7b61e72912248d06bbe511997fc734f6839ff4f8
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Need zip checksums, not exe checksums
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 3769825a84 Need zip checksums, not exe checksums
3769825a84 is described below
commit 3769825a84a168075489374dc9057671efd46515
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:49:48 2023 +0100
Need zip checksums, not exe checksums
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index f09d51716c..b29d2c1de6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -158,7 +158,7 @@
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-nativ
nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=dc6015c4ca2bcfd1a2b7f315ddf99922|0322ebc9ddef97ca66762319df79032b63fbf1f2
+nsis.checksum.value=d0d9ebe60bc2507014a0c1c2fb0e25f2|7b61e72912248d06bbe511997fc734f6839ff4f8
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-8.5.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/558 Blamelist: Mark Thomas , dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 8.5.x] cf9be40584a7b3a411fc4b380dff6262004ac264 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 2 -- ASF 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.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/633 Blamelist: Mark Thomas , dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] fce65324ba65547211eca78495853df8a5bd67e9 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 2 -- ASF 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-10.1.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/884 Blamelist: Mark Thomas , dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] 8e8b50cb79a583d9ba7649d827d518eba8e64e65 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 2 -- ASF 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-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/501 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 029eab2f1f171fe19f0abec3e4927562842b211e Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 2 -- ASF Buildbot - 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: Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool
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 cf9be40584 Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool cf9be40584 is described below commit cf9be40584a7b3a411fc4b380dff6262004ac264 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jul 7 21:54:07 2023 + Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool Bumps [h2](https://github.com/h2database/h2database) from 2.1.210 to 2.2.220. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.1.210...version-2.2.220) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- modules/jdbc-pool/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index 90e10d6ffd..df8af1a595 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -80,7 +80,7 @@ com.h2database h2 - 2.1.210 + 2.2.220 test - 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: Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool
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 fce65324ba Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool fce65324ba is described below commit fce65324ba65547211eca78495853df8a5bd67e9 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jul 7 21:54:07 2023 + Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool Bumps [h2](https://github.com/h2database/h2database) from 2.1.210 to 2.2.220. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.1.210...version-2.2.220) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- modules/jdbc-pool/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index f054ac9d30..22ad5a764f 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -82,7 +82,7 @@ com.h2database h2 - 2.1.210 + 2.2.220 test - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool
This is an automated email from the ASF dual-hosted git repository. markt 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 8e8b50cb79 Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool 8e8b50cb79 is described below commit 8e8b50cb79a583d9ba7649d827d518eba8e64e65 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jul 7 21:54:07 2023 + Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool Bumps [h2](https://github.com/h2database/h2database) from 2.1.210 to 2.2.220. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.1.210...version-2.2.220) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- modules/jdbc-pool/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index 30895250dc..986b90d959 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -82,7 +82,7 @@ com.h2database h2 - 2.1.210 + 2.2.220 test - 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: Update Checkstyle to 10.12.2
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 97f24e3f04 Update Checkstyle to 10.12.2
97f24e3f04 is described below
commit 97f24e3f049b1aa1c5b136bcf32b318d86ca9137
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:18:44 2023 +0100
Update Checkstyle to 10.12.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e49db2c498..9977c437e5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -280,10 +280,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.1
+checkstyle.version=10.12.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=0c5a68e86c5a330e4b76b3c6afd931d3d71195a58a11d42ef009bf2c96f3e8616429709dc1bd9d38b7eafbdb4e18c7a6443320d9f4666520b5d07a645cb7632f
+checkstyle.checksum.value=a449f1de0e74935fbc8a1ae3d1425cf1a2d845c9e7e780821c5d8c2a830ae74ea7b4a5d3f5c732b628db7806403e7e4c05e73a423e6b769f1bee5b1e74be9623
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8be0dac5ad..16de4aa76b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -150,6 +150,9 @@
Update NSIS to 3.0.9. (markt)
+
+Update Checkstyle to 10.12.2. (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: Update Checkstyle to 10.12.2
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 7dd923d3b5 Update Checkstyle to 10.12.2
7dd923d3b5 is described below
commit 7dd923d3b561cdcb91fdc24b3d80ba05fd6a54a5
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:18:44 2023 +0100
Update Checkstyle to 10.12.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 252646d470..61066f5ba0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -276,10 +276,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.1
+checkstyle.version=10.12.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=0c5a68e86c5a330e4b76b3c6afd931d3d71195a58a11d42ef009bf2c96f3e8616429709dc1bd9d38b7eafbdb4e18c7a6443320d9f4666520b5d07a645cb7632f
+checkstyle.checksum.value=a449f1de0e74935fbc8a1ae3d1425cf1a2d845c9e7e780821c5d8c2a830ae74ea7b4a5d3f5c732b628db7806403e7e4c05e73a423e6b769f1bee5b1e74be9623
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ab239fdec8..02d4ffaefb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -171,6 +171,9 @@
Update NSIS to 3.0.9. (markt)
+
+Update Checkstyle to 10.12.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update Checkstyle to 10.12.2
This is an automated email from the ASF dual-hosted git repository.
markt 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 4a1e31fae4 Update Checkstyle to 10.12.2
4a1e31fae4 is described below
commit 4a1e31fae4594eb9883f5e0c5049cbb6ca3fcb0d
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:18:44 2023 +0100
Update Checkstyle to 10.12.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 95963c6c5c..e5d80d8662 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -274,10 +274,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.1
+checkstyle.version=10.12.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=0c5a68e86c5a330e4b76b3c6afd931d3d71195a58a11d42ef009bf2c96f3e8616429709dc1bd9d38b7eafbdb4e18c7a6443320d9f4666520b5d07a645cb7632f
+checkstyle.checksum.value=a449f1de0e74935fbc8a1ae3d1425cf1a2d845c9e7e780821c5d8c2a830ae74ea7b4a5d3f5c732b628db7806403e7e4c05e73a423e6b769f1bee5b1e74be9623
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 07abe336f2..715c23c36c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,9 @@
Update NSIS to 3.0.9. (markt)
+
+Update Checkstyle to 10.12.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update Checkstyle to 10.12.2
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 029eab2f1f Update Checkstyle to 10.12.2
029eab2f1f is described below
commit 029eab2f1f171fe19f0abec3e4927562842b211e
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:18:44 2023 +0100
Update Checkstyle to 10.12.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 942f995fab..f09d51716c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.1
+checkstyle.version=10.12.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=0c5a68e86c5a330e4b76b3c6afd931d3d71195a58a11d42ef009bf2c96f3e8616429709dc1bd9d38b7eafbdb4e18c7a6443320d9f4666520b5d07a645cb7632f
+checkstyle.checksum.value=a449f1de0e74935fbc8a1ae3d1425cf1a2d845c9e7e780821c5d8c2a830ae74ea7b4a5d3f5c732b628db7806403e7e4c05e73a423e6b769f1bee5b1e74be9623
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 260845b77e..3b32926b8d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -167,6 +167,9 @@
Update NSIS to 3.0.9. (markt)
+
+Update Checkstyle to 10.12.2. (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: Update NSIS to 3.0.9
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 0dcaca9ee4 Update NSIS to 3.0.9
0dcaca9ee4 is described below
commit 0dcaca9ee436e292cb38a4afb3282133ff86b34c
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:13:52 2023 +0100
Update NSIS to 3.0.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f93f07d746..e49db2c498 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -182,10 +182,10 @@
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.08
+nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=1cf3cd8e14e31e02c2168770c0eaeacb|057e83c7d82462ec394af76c87d06733605543d4
+nsis.checksum.value=dc6015c4ca2bcfd1a2b7f315ddf99922|0322ebc9ddef97ca66762319df79032b63fbf1f2
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f5cea73c49..8be0dac5ad 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,13 @@
+
+
+
+Update NSIS to 3.0.9. (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: Update NSIS to 3.0.9
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 e4484ce33a Update NSIS to 3.0.9
e4484ce33a is described below
commit e4484ce33aef7c4b9750483b9ceb382df74d216d
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:13:52 2023 +0100
Update NSIS to 3.0.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ab7feae160..252646d470 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -178,10 +178,10 @@
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.08
+nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=1cf3cd8e14e31e02c2168770c0eaeacb|057e83c7d82462ec394af76c87d06733605543d4
+nsis.checksum.value=dc6015c4ca2bcfd1a2b7f315ddf99922|0322ebc9ddef97ca66762319df79032b63fbf1f2
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b567b43f56..ab239fdec8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,9 @@
Align documentation for maxParameterCount to match hard-coded defaults.
Contributed by Michal Sobkiewicz. (schultz)
+
+Update NSIS to 3.0.9. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update NSIS to 3.0.9
This is an automated email from the ASF dual-hosted git repository.
markt 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 126da296ed Update NSIS to 3.0.9
126da296ed is described below
commit 126da296edb3e01a4c42e06533fcdfd81206bdef
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:13:52 2023 +0100
Update NSIS to 3.0.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f4edd41bf3..95963c6c5c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -176,10 +176,10 @@
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.08
+nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=1cf3cd8e14e31e02c2168770c0eaeacb|057e83c7d82462ec394af76c87d06733605543d4
+nsis.checksum.value=dc6015c4ca2bcfd1a2b7f315ddf99922|0322ebc9ddef97ca66762319df79032b63fbf1f2
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a2631300b4..07abe336f2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,13 @@
+
+
+
+Update NSIS to 3.0.9. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update NSIS to 3.0.9
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 82f26b9d13 Update NSIS to 3.0.9
82f26b9d13 is described below
commit 82f26b9d13ce872786b9c6181a8914f21c78e104
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:13:52 2023 +0100
Update NSIS to 3.0.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 013329919a..942f995fab 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -155,10 +155,10 @@
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.08
+nsis.version=3.09
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=1cf3cd8e14e31e02c2168770c0eaeacb|057e83c7d82462ec394af76c87d06733605543d4
+nsis.checksum.value=dc6015c4ca2bcfd1a2b7f315ddf99922|0322ebc9ddef97ca66762319df79032b63fbf1f2
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b902df6735..260845b77e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -162,6 +162,13 @@
+
+
+
+Update NSIS to 3.0.9. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Drop the loom module now virtual thread support has been integrated
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 e44ebbf9f8 Drop the loom module now virtual thread support has been
integrated
e44ebbf9f8 is described below
commit e44ebbf9f874f6f2264c73de19b3c807b3d0c603
Author: Mark Thomas
AuthorDate: Wed Aug 2 16:02:55 2023 +0100
Drop the loom module now virtual thread support has been integrated
If we decide to return to the idea of a BioLoomEndpoint (really not sure
there is any benefit in it) then we can restore the code from one of the
previous 11.0.0 milestone tags.
---
modules/loom/.gitignore| 1 -
modules/loom/pom.xml | 100 -
.../coyote/http11/Http11BioLoomProtocol.java | 55 ---
.../apache/coyote/http11/Http11LoomProcessor.java | 26 --
.../apache/tomcat/util/net/BioLoomEndpoint.java| 453 -
5 files changed, 635 deletions(-)
diff --git a/modules/loom/.gitignore b/modules/loom/.gitignore
deleted file mode 100644
index eb5a316cbd..00
--- a/modules/loom/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/modules/loom/pom.xml b/modules/loom/pom.xml
deleted file mode 100644
index b04f69e41b..00
--- a/modules/loom/pom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-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
-apache
-27
-
-
-org.apache.tomcat
-tomcat-coyote-loom
-Apache Tomcat support for Project Look
-Project Loom support included in Java 19 early
preview
-0.1-SNAPSHOT
-
-
-11.0.0-M1-SNAPSHOT
-
-
-
-
scm:git:https://gitbox.apache.org/repos/asf/tomcat.git
-
scm:git:https://gitbox.apache.org/repos/asf/tomcat.git
-https://gitbox.apache.org/repos/asf?p=tomcat.git
-HEAD
-
-
-
-
- Development List
- dev-subscr...@tomcat.apache.org
-
dev-unsubscr...@tomcat.apache.org
- dev@tomcat.apache.org
-
-
- Users List
- users-subscr...@tomcat.apache.org
-
users-unsubscr...@tomcat.apache.org
- us...@tomcat.apache.org
-
-
-
-
-
-org.apache.tomcat
-tomcat-catalina
-${tomcat.version}
-provided
-
-
-org.apache.tomcat
-tomcat-coyote
-${tomcat.version}
-provided
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 19
- 19
-
- --enable-preview
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
- 19
-
-
--enable-preview
-
-
-
-
-
-
-
diff --git
a/modules/loom/src/main/java/org/apache/coyote/http11/Http11BioLoomProtocol.java
b/modules/loom/src/main/java/org/apache/coyote/http11/Http11BioLoomProtocol.java
deleted file mode 100644
index 00999c009c..00
---
a/modules/loom/src/main/java/org/apache/coyote/http11/Http11BioLoomProtocol.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- *
[tomcat] branch dependabot/maven/modules/jdbc-pool/com.h2database-h2-2.2.220 deleted (was 0dfff605d7)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch dependabot/maven/modules/jdbc-pool/com.h2database-h2-2.2.220 in repository https://gitbox.apache.org/repos/asf/tomcat.git was 0dfff605d7 Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool 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] branch main updated: Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool
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 e21636bb87 Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool e21636bb87 is described below commit e21636bb87e4fb73fe8e52f3d5569a28b77d082b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jul 7 21:54:07 2023 + Bump h2 from 2.1.210 to 2.2.220 in /modules/jdbc-pool Bumps [h2](https://github.com/h2database/h2database) from 2.1.210 to 2.2.220. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.1.210...version-2.2.220) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- modules/jdbc-pool/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index 40e7f286f9..dfe5639cbf 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -82,7 +82,7 @@ com.h2database h2 - 2.1.210 + 2.2.220 test - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: OSGI Portable Java Contract Definitions for the Expression Language
I opened: https://bz.apache.org/bugzilla/show_bug.cgi?id=66834 Thanks, Paul Nicolucci On Wed, Jul 19, 2023 at 7:31 AM Mark Thomas wrote: > > 18 Jul 2023 00:50:29 Paul Nicolucci : > > > Hi, > > > > I was looking over the Expression Language API and implementation and > > noticed the following: 11.0.0-M9 > > > > API Manifest.mf: > > Provide-Capability: osgi.contract;osgi.contract=JavaEL;version:Version > > ="6.0";uses:="jaka > > > > Implementation Manifest.mf: > > Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi > > celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))",osgi.contrac > > t;osgi.contract=JavaEL;filter:="(&(osgi.contract=JavaEL)(version=6.0. > > 0))",osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))" > > > > Specifically the JavaEL contract definition. It looks as though new > > contracts were published for Jakarta Expression Language: > > > > > https://docs.osgi.org/reference/portable-java-contracts.html#java-ee-contracts > > > > Should this be updated from JavaEL to JakartaExpressionLanguage for > > Expression Language 4.0/5.0/6.0? > > Looks like it should. > > We should check the other Jakarta API JARs as well. > > Please create a bugzilla issue and/or pull request so this doesn't get > forgotten. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 66834] New: Expression Language 6.0 should be updated to provide the new osgi.contract name for Expression Language 6.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=66834 Bug ID: 66834 Summary: Expression Language 6.0 should be updated to provide the new osgi.contract name for Expression Language 6.0 Product: Tomcat 11 Version: unspecified Hardware: PC Status: NEW Severity: normal Priority: P2 Component: EL Assignee: dev@tomcat.apache.org Reporter: pnicolu...@gmail.com Target Milestone: --- OSGI Contracts are detailed here: https://docs.osgi.org/reference/portable-java-contracts.html#java-ee-contracts Currently, the Expression Language provides the JavaEL OSGI Contract but starting with Expression Language 4.0 a new OSGI contract was created: JakartaExpressionLanguage currently listed for Expression Language 4.0 and 5.0 and 6.0 should follow. At the very least the OSGI contract should be updated for Expression Language 6.0, updates to 4.0 and 5.0 can be discussed in this issue as well. -- 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
[Bug 65995] Change JavaScript MIME type from application/javascript to text/javascript
https://bz.apache.org/bugzilla/show_bug.cgi?id=65995 --- Comment #6 from Alex Melnikov --- Hello! I'm wondering why this change also breaks existing applications setting Content-Type to 'application/javascript'. I'm totally agree that Tomcat should not use obsolete mime types. I can understand if Tomcat prints a warning about obsolete mime type, but in our case Tomcat returns http response code 406 and not returning response body. For us it not critical, we can update our code. But for some other people this can trigger more problems. -- 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: [VOTE] Release Apache Tomcat Native 1.2.38
On 02/08/2023 11:08, Mark Thomas wrote: The Apache Tomcat Native 1.2.38 release is [X] Stable, go ahead and release [ ] Broken because of ... Built and passed unit tests for 9.0.x on Linux, Windows, macOS M1 and macOS Intel. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix Javadoc formatting
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 ad76237a90 Fix Javadoc formatting
ad76237a90 is described below
commit ad76237a90a8aaff331e990a0d9e95f3aec1bf79
Author: Mark Thomas
AuthorDate: Wed Aug 2 11:43:59 2023 +0100
Fix Javadoc formatting
---
java/jakarta/el/OptionalELResolver.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/jakarta/el/OptionalELResolver.java
b/java/jakarta/el/OptionalELResolver.java
index 95eb1c5323..c16c8f781b 100644
--- a/java/jakarta/el/OptionalELResolver.java
+++ b/java/jakarta/el/OptionalELResolver.java
@@ -38,8 +38,7 @@ import java.util.Optional;
* {@link ELResolver} obtained from {@link ELContext#getELResolver()} with the
following parameters:
*
* The {@link ELContext} is the current context
- * The base object is the result of calling {@link Optional#get()} on the
current base object
- *
+ * The base object is the result of calling {@link Optional#get()} on the
current base object
* The property object is the current property object
*
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 1.2.38
Version 1.2.38 includes the following changes compared to 1.2.37 - Align default pass phrase prompt with HTTPd - The windows binaries in this release have been built with OpenSSL 1.1.1v and APR 1.7.4 The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.38 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.38 [2] https://github.com/apache/tomcat-native/tree/79282a056db1cf624cac11a4f014b4a9e72058bd - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r63313 - in /dev/tomcat/tomcat-connectors/native/1.2.38: ./ binaries/ source/
Author: markt Date: Wed Aug 2 09:41:45 2023 New Revision: 63313 Log: Upload Tomcat Native 1.2.38 for voting Added: dev/tomcat/tomcat-connectors/native/1.2.38/ dev/tomcat/tomcat-connectors/native/1.2.38/binaries/ dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.38/source/ dev/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip.asc Wed Aug 2 09:41:45 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmTKJLMACgkQEMAcWi9g +WedDcxAA2cSqWQ1OEn1wtjb+oudNxvXjW7AWNSaaQx3r+qbq9Mr1m62UZe18f4Nq +Xx2oMm/K4rNSuuqHV7VmrsaHfVtRL0DLLPihZRs963ISyDqaahgxh/DEa2FrecA3 +ejtTydp+l+SvQphqZqgrhdD6FeQUyD+dfC2XfvlyZNq+I1+Dxku65nDlT6X4+pXD +TV42gZz5mM7f/6TToz/VFirhqHpsc/zZAdWqZKRFkh4sk5lsRJM6HahBkLGXxnth +YLjfe0I38YfCr6mGVVCRQ87ebKCtW7i7IdMoxigA4l0tmZGlTst9z5lDd9TcosJC +pIhRxNPq8pE2V10jERTesDKEeZurS5Bbo+Qbdklrxxy+x6VYCmnMdv3N6hloMB5R +ytWzpLkyctyACpdiME2yZBd81k42/S8aLsYi2EPXUxBOJg+zJIrJYgv1+QUvozRs +257NCUVWH56K5+uWcIKm6oNCjLTwR/zrI4LT3ZnPJ83f/MtSqDRy3JfX7c4WHb1X +n3eLVMaPJlUCh8nN10yQ+dWio7QZyv6WDrpiLW8uleRHdKOgTv26POjwUhD3cJ0P +sLTMwNnIf7c2pUTX2xnqjKEKJv+Z4rXhZ1jn1UwCbRiM1qXr14H7vz08ewTjQvGK +YnVYvQTVnwYh7RFvbiOa7ArZY6/pqMHc1mLp0yBRQVCmHcvM79E= +=j31U +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip.sha512 == --- dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip.sha512 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip.sha512 Wed Aug 2 09:41:45 2023 @@ -0,0 +1 @@ +97115996604ed85e3a833269a94db2e3e191ae5828096bfbbc6d09ddaf75d7f304456b8d79b8911326125da8627dabdf8fbe1ccfaa8ff962f78e58d672966f5a *tomcat-native-1.2.38-openssl-1.1.1v-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.38/binaries/tomcat-native-1.2.38-openssl-1.1.1v-win32-bin.zip --
svn commit: r63312 - /release/tomcat/tomcat-connectors/native/1.2.36/
Author: markt Date: Wed Aug 2 09:40:25 2023 New Revision: 63312 Log: Drop old release from CDN Removed: release/tomcat/tomcat-connectors/native/1.2.36/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 2.0.5
> On Aug 2, 2023, at 02:24, Mark Thomas wrote: > > The key differences of version 2.0.5 compared to 2.0.4 are: > > - Align default pass phrase prompt with HTTPd > - Update autotools and associated fixes > - Fix memory leak in SNI processing > - The windows binaries in this release have been built with OpenSSL > 3.0.10 and APR 1.7.4 > > The 2.0.x branch is primarily intended for use with Tomcat 10.1.x onwards but > can be used with earlier versions as long as the APR/native connector is not > used. > > The proposed release artifacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 2.0.5 release is > [X ] Stable, go ahead and release > [ ] Broken because of ... Han > > Thanks, > > Mark > > > [1] > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.5 > [2] > https://github.com/apache/tomcat-native/commit/7b3d702481bc9198e958b88a1f6028b9be5de4ff > > - > 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-native] branch 1.2.x updated: Fix more branch references
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 2b8d722c8 Fix more branch references 2b8d722c8 is described below commit 2b8d722c83cfa4e0ce4652aa1a37926affbc848d Author: Mark Thomas AuthorDate: Wed Aug 2 09:11:10 2023 +0100 Fix more branch references --- HOWTO-RELEASE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt index dcd014823..7e811aab7 100644 --- a/HOWTO-RELEASE.txt +++ b/HOWTO-RELEASE.txt @@ -67,7 +67,7 @@ git commit -a -m "Tag 1.2.35" git tag 1.2.35 git push origin 1.2.35 -# Reset main +# Reset 1.2.x git reset --hard HEAD~1 @@ -77,8 +77,8 @@ Create the source release # Modify version as appropriate ./jnirelease.sh --ver=1.2.35 --with-apr=/path/to/apr/source -# Switch back to the main branch -git checkout main +# Switch back to the 1.2.x branch +git checkout 1.2.x Create the binary release for Windows - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 1.2.38 created (now 79282a056)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 1.2.38 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git at 79282a056 (commit) This tag includes the following new commits: new 79282a056 Tag 1.2.38 The 1 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-native] 01/01: Tag 1.2.38
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 1.2.38
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 79282a056db1cf624cac11a4f014b4a9e72058bd
Author: Mark Thomas
AuthorDate: Wed Aug 2 09:09:54 2023 +0100
Tag 1.2.38
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8fdf6f217..064b27524 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=1
version.minor=2
version.build=38
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 88fdd0f84..83e53072c 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Correct branch for 1.2.x releases
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 7491fb391 Correct branch for 1.2.x releases 7491fb391 is described below commit 7491fb39139f3c66378a1af5e5de07b6996a2b5d Author: Mark Thomas AuthorDate: Wed Aug 2 09:07:31 2023 +0100 Correct branch for 1.2.x releases --- HOWTO-RELEASE.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt index b88349c8c..dcd014823 100644 --- a/HOWTO-RELEASE.txt +++ b/HOWTO-RELEASE.txt @@ -45,8 +45,8 @@ Run the release script to check the Java code is aligned with the current 9.0.x source. ./jnirelease.sh --ver=1.2.x --with-apr=/path/to/apr/source -Switch back to the main branch -git checkout main +Switch back to the 1.2.x branch +git checkout 1.2.x Tagging --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Update the minimum recommended OpenSSL version to 1.1.1v
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 0d8b3e97d Update the minimum recommended OpenSSL version to 1.1.1v 0d8b3e97d is described below commit 0d8b3e97d3b78201facbf80f07d8faf86cb98d0b Author: Mark Thomas AuthorDate: Wed Aug 2 09:06:17 2023 +0100 Update the minimum recommended OpenSSL version to 1.1.1v --- native/download_deps.sh | 2 +- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/native/download_deps.sh b/native/download_deps.sh index 941904d85..cf3ec3e97 100755 --- a/native/download_deps.sh +++ b/native/download_deps.sh @@ -5,7 +5,7 @@ cd $(dirname $0) -SSL=openssl-1.1.1u.tar.gz +SSL=openssl-1.1.1v.tar.gz APR=apr-1.7.4.tar.gz mkdir -p deps diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index 1e8ae5333..71db84fd6 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -5,7 +5,7 @@ The current minimum versions are: The following version of the libraries are recommended: - APR 1.7.4 or later, http://apr.apache.org -- OpenSSL 1.1.1u or later, http://www.openssl.org +- OpenSSL 1.1.1v or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 667b539f9..b38e244c4 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -38,6 +38,9 @@ 9: Fix memory leak in SNI processing. (markt) + + Update the recommended minimum version of OpenSSL to 1.1.1v. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat-native] 01/01: Tag 2.0.5
On 02/08/2023 08:19, Rainer Jung wrote: Hi Mark, thanks for the tag. Do you intend to tag 1.2 as well? Yes. That is next on my TODO list for this morning once I catch up with all the overnight email. I wanted to make sure that 2.0.5 built and the tests passed before starting on 1.2.x. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat-native] 01/01: Tag 2.0.5
Hi Mark, thanks for the tag. Do you intend to tag 1.2 as well? Thanks and regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
