You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/04/12 22:16:41 UTC
[tomcat] branch 10.1.x updated (a29573a2b4 -> 74ab3f22dc)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from a29573a2b4 Improve unreliable test (failures on Windows and Intel Mac)
new 55a9821a5f tabs -> spaces
new c9b38c688c Update Eclipse ECJ to 4.27 (3.33.0)
new 83b19cc3f2 Update UnboundID to 6.0.8
new 3911080246 Update Checkstyle to 10.9.3
new 74ab3f22dc Update Jacoco to 0.8.9
The 5 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:
build.properties.default | 24 +++++++++++-----------
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
.../tomcat/websocket/server/TestKeyHeader.java | 2 +-
webapps/docs/changelog.xml | 12 +++++++++++
6 files changed, 28 insertions(+), 16 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/05: Update Checkstyle to 10.9.3
Posted by ma...@apache.org.
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
commit 3911080246d03220fe86156c6ce8ecc69b884c21
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 12 16:55:53 2023 +0100
Update Checkstyle to 10.9.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 57fee5c9de..f96ac64b27 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,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.7.0
+checkstyle.version=10.9.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=5527f5fca9870d02f691b4d34459386d203558414bdbfb2a117af698101487b4ab6387174e600745a7d1acf0a0358d78bb219d0fba47e4b7ef9365395b0b41b6
+checkstyle.checksum.value=57443ea697a02630cea080e78296545586ce2fa40c72d4d5e3d24c511287fc5d460e274ef49a6c0fc386682df248c4306a232b5f13d844c2ef4d1613d5b37e92
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 5f4ad21cca..7859f608eb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -291,7 +291,10 @@
Update to the Eclipse JDT compiler 4.27. (markt)
</update>
<update>
- Update Unboundid to 6.0.8. (markt)
+ Update UnboundID to 6.0.8. (markt)
+ </update>
+ <update>
+ Update Checkstyle to 10.9.3. (markt)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/05: tabs -> spaces
Posted by ma...@apache.org.
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
commit 55a9821a5fb1681cc9dba5820d2ed2526e7ab77d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 12 16:26:02 2023 +0100
tabs -> spaces
---
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
test/org/apache/tomcat/websocket/server/TestKeyHeader.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java b/java/org/apache/tomcat/websocket/WsSession.java
index 45703457f5..a3310eec0d 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -463,7 +463,7 @@ public class WsSession implements Session {
public boolean isClosed() {
- return state == State.CLOSED;
+ return state == State.CLOSED;
}
diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index 19f226351e..e731344e11 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -84,7 +84,7 @@ public class TestKeyHeader extends WebSocketBaseTest {
// Read (and ignore) the response
byte[] buf = new byte[256];
while (client.read(buf) > 0) {
- // Ignore
+ // Ignore
}
}
client.closeSocket();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/05: Update UnboundID to 6.0.8
Posted by ma...@apache.org.
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
commit 83b19cc3f275bd16df2ba5d3e2c66a90f652692e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 12 16:47:23 2023 +0100
Update UnboundID to 6.0.8
---
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 9330e57703..57fee5c9de 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -262,10 +262,10 @@ objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# ----- UnboundID, used by unit tests, version 5.1.4 or later -----
-unboundid.version=6.0.7
+unboundid.version=6.0.8
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=c0adafab9e493150b9729f51fb0dee6a787821ab93a760794962fadcdbbbf9f868e5c159f3a344c43f0b7b037b9b01b35f86e4bc97e903a40e25c884cdedaf5b
+unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
unboundid.home=${base.path}/unboundid-${unboundid.version}
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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d68c3571ce..5f4ad21cca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -290,6 +290,9 @@
<update>
Update to the Eclipse JDT compiler 4.27. (markt)
</update>
+ <update>
+ Update Unboundid to 6.0.8. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/05: Update Eclipse ECJ to 4.27 (3.33.0)
Posted by ma...@apache.org.
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
commit c9b38c688c0b191cf9a141ac1344125ad0b74ab8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 12 16:41:59 2023 +0100
Update Eclipse ECJ to 4.27 (3.33.0)
---
build.properties.default | 12 ++++++------
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 3 +++
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 99c87c9501..9330e57703 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -141,15 +141,15 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# ----- Eclipse JDT, version 4.7 or later -----#
# See https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.26" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/checksum/eclipse-4.26-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.27" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/checksum/eclipse-4.27-SUMSSHA512
#
-jdt.version=4.26
-jdt.release=R-4.26-202211231800
+jdt.version=4.27
+jdt.release=R-4.27-202303020300
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=62b19c6701547cb30922fd336a0d40fb0610279a732a93673910954028b79d69e0e3175494d20d3dae9bf4b844677c6bc5d29f337f45b6988bcfaf93b3787602
+jdt.checksum.value=69b57e12aa7f1339fe86fdb82f8fe9a104ff4d5e887448a779059e4f0626c43af0f1539569d9669c3f3add54fce6447e0bdcec93ee52ad25bf9697f7ac59ca7f
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking care of that in advance.
diff --git a/res/maven/tomcat-embed-jasper.pom b/res/maven/tomcat-embed-jasper.pom
index c66cae5bc4..72a85db2a7 100644
--- a/res/maven/tomcat-embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>3.32.0</version>
+ <version>3.33.0</version>
</dependency>
</dependencies>
</project>
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 5212e72242..264cb80777 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>3.32.0</version>
+ <version>3.33.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2f51ecdf73..d68c3571ce 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -287,6 +287,9 @@
handling of <code>JRE_HOME</code> and <code>JAVA_HOME</code> for the
start-up scripts and the service install script. (markt)
</fix>
+ <update>
+ Update to the Eclipse JDT compiler 4.27. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/05: Update Jacoco to 0.8.9
Posted by ma...@apache.org.
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
commit 74ab3f22dc6f57f6b3804552684badcd0e642c84
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 12 17:06:49 2023 +0100
Update Jacoco to 0.8.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 f96ac64b27..d2d8a45b67 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -280,10 +280,10 @@ 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
# ----- JaCoCo code coverage tool -----
-jacoco.version=0.8.8
+jacoco.version=0.8.9
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
+jacoco.checksum.value=a158dfd8d88760ee615854fb27ad3a88|2f29cf6431a011f538c768e56a0b358a9f00f52d
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7859f608eb..7e1b56c5a4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -296,6 +296,9 @@
<update>
Update Checkstyle to 10.9.3. (markt)
</update>
+ <update>
+ Update Jacoco to 0.8.9. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org