[tomcat] branch master updated: Update checkstyle to 8.22
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 22acea9 Update checkstyle to 8.22
22acea9 is described below
commit 22acea9af7be7e50df0b5c84d25f5a2c033ea489
Author: Mark Thomas
AuthorDate: Fri Jul 5 18:36:09 2019 +0100
Update checkstyle to 8.22
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9c31c8b..4b79f07 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -97,6 +97,7 @@ base-commons.loc.2=${base-apache.loc.2}/commons
base-tomcat.loc.1=${base-apache.loc.1}/tomcat
base-tomcat.loc.2=${base-apache.loc.2}/tomcat
+base-gh.loc=https://github.com
base-sf.loc=https://downloads.sourceforge.net
# repo.maven.apache.org is the same as repo2.maven.org
base-maven.loc=https://repo.maven.apache.org/maven2
@@ -245,14 +246,13 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - Checkstyle, version 6.16 or later -
-# Checksums are available at
https://sourceforge.net/projects/checkstyle/files/OldFiles/6.17/
-checkstyle.version=6.17
+checkstyle.version=8.22
checkstyle.checksum.enabled=true
-checkstyle.checksum.algorithm=MD5|SHA-1
-checkstyle.checksum.value=9180ab8b8219b262bfe88f26fd95d26d|11a02d7b0374f8a82fbd76361a69756faa6aefa0
+checkstyle.checksum.algorithm=SHA-512
+checkstyle.checksum.value=d595e284ec440e20367b93a1835357f1c4c2cf77af4589caafdaa995aa9e8a341716ad59f5222fff484275f23c11beb71ad58792cc6cdbdb261e320724b9418f
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
+checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - Cobertura code coverage tool -
cobertura.version=2.1.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 89b0445..bcc5a0c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -59,6 +59,9 @@
Improvements and workarounds for GraalVM native images. (remm)
+
+Update Checkstyle to 8.22. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Update WSDL to 1.6.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9441731afcae443fb0ccd9f1543d34f998a28374
Author: Mark Thomas
AuthorDate: Fri Jul 5 17:41:17 2019 +0100
Update WSDL to 1.6.3
---
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 a878fe4..11919da 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -148,10 +148,10 @@
jaxrpc-lib.jar=${jaxrpc-lib.home}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
# - Webservices - WSDL4J -
-wsdl4j-lib.version=1.6.2
+wsdl4j-lib.version=1.6.3
wsdl4j-lib.checksum.enabled=true
wsdl4j-lib.checksum.algorithm=MD5|SHA-1
-wsdl4j-lib.checksum.value=2608a8ea3f07b0c08de8a7d3d0d3fc09|dec1669fb6801b7328e01ad72fc9e10b69ea06c1
+wsdl4j-lib.checksum.value=cfc28d89625c5e88589aec7a9aee0208|6d106a6845a3d3477a1560008479312888e94f2f
wsdl4j-lib.home=${base.path}/wsdl4j-${wsdl4j-lib.version}
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8aa9e63..94bcdbd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -234,6 +234,9 @@
Update JUnit to version 4.12. (markt)
+
+Update optional WSDL dependency to 1.6.3. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Clean-up
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e45ea31734f52271ceb96a1db40967632230c50
Author: Mark Thomas
AuthorDate: Fri Jul 5 18:19:32 2019 +0100
Clean-up
---
build.properties.default | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 11919da..92cea40 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -277,7 +277,7 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - Checkstyle, version 6.0 or later -
-# Limited to 6.1.1 since that is the latest release that supports Java 6
+# Checkstyle 6.1.1 is the last release that supports Java 6
# Gump uses the latest checkstyle and the configuration format is incompatible
# between the latest version and 6.1.1
# Therefore, use checkstyle-backport-jre6
@@ -286,9 +286,8 @@ checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=MD5|SHA-1
checkstyle.checksum.value=e268f16a5cab5b291546fae909e3f9b3|b626c3e518f315faf860b521807c31a03c9e2d8a
checkstyle.home=${base.path}/checkstyle-backport-jre6-${checkstyle.version}
-checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-jre6/${checkstyle.version}/checkstyle-backport-jre6-${checkstyle.version}-all.jar
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-
+checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-jre6/${checkstyle.version}/checkstyle-backport-jre6-${checkstyle.version}-all.jar
# - Cobertura code coverage tool -
cobertura.version=2.0.3
-
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 to Checkstyle 8.22
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 c810721 Update to Checkstyle 8.22
c810721 is described below
commit c8107214e6462e15c4df017bce45da08758f15b0
Author: Mark Thomas
AuthorDate: Fri Jul 5 18:22:53 2019 +0100
Update to Checkstyle 8.22
---
build.properties.default | 14 +-
webapps/docs/changelog.xml | 9 +
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f30d21e..0c5113a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -103,6 +103,9 @@ base-maven.loc=https://repo.maven.apache.org/maven2
# Mirror, was used when there were problems with the main SF downloads site
# base-sf.loc=https://sunet.dl.sourceforge.net
+# checkstyle-backport-jre6
+base-checkstyle.loc=https://rnveach.github.io/checkstyle-backport-jre6/maven2
+
# - Webservices - JAX RPC -
jaxrpc-lib.version=1.1-rc4
jaxrpc-lib.checksum.enabled=true
@@ -247,14 +250,15 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - Checkstyle, version 6.16 or later -
-# Checksums are available at
https://sourceforge.net/projects/checkstyle/files/OldFiles/6.17/
-checkstyle.version=6.17
+# Checkstyle 7 requires Java 8
+# Therefore, use checkstyle-backport-jre6
+checkstyle.version=8.22
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=MD5|SHA-1
-checkstyle.checksum.value=9180ab8b8219b262bfe88f26fd95d26d|11a02d7b0374f8a82fbd76361a69756faa6aefa0
-checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
+checkstyle.checksum.value=03cb9ae24d4103134095ccd650b3bbb7|32d2996bedc97ee4e22c50e6ff5a8b571c8d816e
+checkstyle.home=${base.path}/checkstyle-backport-jre6-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
+checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-jre6/${checkstyle.version}/checkstyle-backport-jre6-${checkstyle.version}-all.jar
# - Cobertura code coverage tool -
cobertura.version=2.1.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5becb35..d9d75bc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Switch from Checkstyle to the JRE6 backport and update to version 8.22.
+This allows Tomcat 8.5 to use the newer Checkstyle releases while still
+building with Java 7. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Update Checkstyle to 8.22
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 21a909b779963b19282a61c8117989ab6adeca06
Author: Mark Thomas
AuthorDate: Fri Jul 5 18:45:39 2019 +0100
Update Checkstyle to 8.22
---
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 92cea40..0df0638 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -281,10 +281,10 @@
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/obj
# Gump uses the latest checkstyle and the configuration format is incompatible
# between the latest version and 6.1.1
# Therefore, use checkstyle-backport-jre6
-checkstyle.version=8.17
+checkstyle.version=8.22
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=MD5|SHA-1
-checkstyle.checksum.value=e268f16a5cab5b291546fae909e3f9b3|b626c3e518f315faf860b521807c31a03c9e2d8a
+checkstyle.checksum.value=03cb9ae24d4103134095ccd650b3bbb7|32d2996bedc97ee4e22c50e6ff5a8b571c8d816e
checkstyle.home=${base.path}/checkstyle-backport-jre6-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-jre6/${checkstyle.version}/checkstyle-backport-jre6-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 94bcdbd..7792e1a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -237,6 +237,9 @@
Update optional WSDL dependency to 1.6.3. (markt)
+
+Update Checkstyle to version 8.22. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated (645f0ce -> 21a909b)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 645f0ce Update Tomcat Native to 1.2.23 new 9441731 Update WSDL to 1.6.3 new 4e45ea3 Clean-up new 21a909b Update Checkstyle to 8.22 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 13 ++--- webapps/docs/changelog.xml | 6 ++ 2 files changed, 12 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63543] New: Race Condition on org.apache.tomcat.util.threads.InlineExecutorService.shutdown
https://bz.apache.org/bugzilla/show_bug.cgi?id=63543 Bug ID: 63543 Summary: Race Condition on org.apache.tomcat.util.threads.InlineExecutorService.s hutdown Product: Tomcat 9 Version: 9.0.2 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Util Assignee: dev@tomcat.apache.org Reporter: april1...@tamu.edu Target Milestone: - InlineExecutorService is designed to run all submitted tasks in a single thread. If so, all the fields in InlineExecutorService (i.e., shutdown, taskRunning, terminated) are thread-safe and do not need lock protection. If this is not the case, shutdown should also be protected by lock in method shutdown(). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update command lines and reflection
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new dc75509 Update command lines and reflection
dc75509 is described below
commit dc75509eb87daa43413ca116fb79a23fac9b5dbb
Author: remm
AuthorDate: Fri Jul 5 15:23:03 2019 +0200
Update command lines and reflection
The Jasper static initializer is a problem.
Bean info access and manipulation in JspRuntimeLibrary seems a bit too
much compared to what Graal can do at the moment, so jsp:setProperty is.
---
res/tomcat-maven/README.md | 4 ++--
res/tomcat-maven/tomcat-reflection.json | 18 +-
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/res/tomcat-maven/README.md b/res/tomcat-maven/README.md
index 170939a..f0448d7 100644
--- a/res/tomcat-maven/README.md
+++ b/res/tomcat-maven/README.md
@@ -94,7 +94,7 @@ in `/WEB-INF/classes` and `/WEB-INF/lib`, must be included as
part of the tomcat
Run Tomcat with the agent in full trace mode.
```
cd $TOMCAT_MAVEN
-$JAVA_HOME/bin/java
-agentlib:native-image-agent=trace-output=$TOMCAT_MAVEN/target/trace-file.json
-jar target/tomcat-maven-1.0.jar
+$JAVA_HOME/bin/java
-agentlib:native-image-agent=trace-output=$TOMCAT_MAVEN/target/trace-file.json
-Dcatalina.base=. -Djava.util.logging.config.file=conf/logging.properties
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -jar
target/tomcat-maven-1.0.jar
```
Then exercise necessary paths of your service with the Tomcat configuration.
Any changes to the Tomcat configuration requires running
the substrate VM with the agent again.
@@ -102,6 +102,6 @@ the substrate VM with the agent again.
Generate the final json files using native-image-configuration then use native
image using the generated reflection metadata:
```
$JAVA_HOME/bin/native-image-configure generate
--trace-input=$TOMCAT_MAVEN/target/trace-file.json
--output-dir=$TOMCAT_MAVEN/target
-$JAVA_HOME/bin/native-image --allow-incomplete-classpath
-H:+ReportUnsupportedElementsAtRuntime -H:EnableURLProtocols=jar
-H:ConfigurationFileDirectories=$TOMCAT_MAVEN/target/
-H:ReflectionConfigurationFiles=$TOMCAT_MAVEN/tomcat-reflection.json
-H:ResourceConfigurationFiles=$TOMCAT_MAVEN/tomcat-resource.json
-H:ResourceConfigurationFiles=$TOMCAT_MAVEN/tomcat-resource.json -jar
$TOMCAT_MAVEN/target/tomcat-maven-1.0.jar
+$JAVA_HOME/bin/native-image --no-server --allow-incomplete-classpath
--initialize-at-build-time=org.eclipse.jdt,org.apache.el.parser.SimpleNode,javax.servlet.jsp.JspFactory,org.apache.jasper.servlet.JasperInitializer,org.apache.jasper.runtime.JspFactoryImpl
-H:+ReportUnsupportedElementsAtRuntime -H:+ReportExceptionStackTraces
-H:EnableURLProtocols=jar -H:ConfigurationFileDirectories=$TOMCAT_MAVEN/target/
-H:ReflectionConfigurationFiles=$TOMCAT_MAVEN/tomcat-reflection.json
-H:ResourceConf [...]
./tomcat-maven-1.0 -Dcatalina.base=.
-Djava.util.logging.config.file=conf/logging.properties
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
```
diff --git a/res/tomcat-maven/tomcat-reflection.json
b/res/tomcat-maven/tomcat-reflection.json
index 9d799d3..8885dac 100644
--- a/res/tomcat-maven/tomcat-reflection.json
+++ b/res/tomcat-maven/tomcat-reflection.json
@@ -1,16 +1,4 @@
[
-{
- "name" : "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl",
- "methods" : [{"name": "","parameterTypes":[] }]
-},
-{
- "name" :
"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
- "methods" : [{"name": "","parameterTypes":[] }]
-},
-{
- "name" : "org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl",
- "methods" : [{"name": "","parameterTypes":[] }]
-},
{ "name":"java.lang.Object" },
{ "name":"javax.servlet.http.HttpServlet" },
{ "name":"org.apache.catalina.AccessLog" },
@@ -48,5 +36,9 @@
{ "name":"org.apache.catalina.WebResourceRoot" },
{ "name":"org.apache.catalina.WebResourceSet" },
{ "name":"org.apache.catalina.Wrapper" },
-{ "name":"org.apache.coyote.UpgradeProtocol" }
+{ "name":"org.apache.coyote.UpgradeProtocol" },
+{ "name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl",
"methods" : [{"name": "","parameterTypes":[]}] },
+{ "name":"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
"methods" : [{"name": "","parameterTypes":[]}] },
+{ "name":"org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl",
"methods" : [{"name": "","parameterTypes":[]}] },
+{ "name":"org.apache.el.ExpressionFactoryImpl", "methods" :
[{"name":"","parameterTypes":[]}] }
]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Increment version number for next development cycle
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ffcb1733e13ea5056295f8b826d40da069b30fd0 Author: Mark Thomas AuthorDate: Thu Jul 4 22:17:40 2019 +0100 Increment version number for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 5c31673..b40b1de 100644 --- a/build.properties.default +++ b/build.properties.default @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=43 +version.build=44 version.patch=0 version.suffix=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index ee1b94c..3c020b3 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=8.5.43 +maven.asf.release.deploy.version=8.5.44 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ebdb3c5..5becb35 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -44,7 +44,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/07: Clean-up. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 383428b0c7ee83b28f35af4aaa03448275b513fb
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:41:42 2019 +0100
Clean-up. No functional change.
---
build.properties.default | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index afa85a4..4b31cc8 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -65,12 +65,13 @@ trydownload.httpusecaches=true
# contexts by the various build scripts.
base.path=${user.home}/tomcat-build-libs
-compile.source=1.6
-compile.target=1.6
compile.debug=true
+# Do not pass -deprecation (-Xlint:deprecation) flag to javac
+compile.deprecation=false
+
base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
-base-apache.loc.2=http://archive.apache.org/dist
+base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
base-tomcat.loc.1=${base-apache.loc.1}/tomcat
@@ -143,8 +144,8 @@ jaxrpc-lib.checksum.enabled=true
jaxrpc-lib.checksum.algorithm=MD5|SHA-1
jaxrpc-lib.checksum.value=4bebba22a4cdb9f68e16c45129770333|fe9371d33dc3e1646d4d13bde19614283eb998b1
jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version}
-jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
jaxrpc-lib.jar=${jaxrpc-lib.home}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
+jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
# - Webservices - WSDL4J -
wsdl4j-lib.version=1.6.2
@@ -152,10 +153,12 @@ wsdl4j-lib.checksum.enabled=true
wsdl4j-lib.checksum.algorithm=MD5|SHA-1
wsdl4j-lib.checksum.value=2608a8ea3f07b0c08de8a7d3d0d3fc09|dec1669fb6801b7328e01ad72fc9e10b69ea06c1
wsdl4j-lib.home=${base.path}/wsdl4j-${wsdl4j-lib.version}
-wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
+wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
# - Eclipse JDT, version 4.4 or later -#
+# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
+#
# 4.4.2 is the latest release that runs on Java 6
# Later versions can be used but the official builds need to use 4.4.2
jdt.version=4.4.2
@@ -252,8 +255,8 @@ easymock.checksum.enabled=true
easymock.checksum.algorithm=MD5|SHA-1
easymock.checksum.value=2d914151580d6749ba0921be7eda705a|9794114433b4788b5d6498164311ecb3a25ff262
easymock.home=${base.path}/easymock-${easymock.version}
-easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
+easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
# - cglib, used by EasyMock, version 2.2 or later -
cglib.version=2.2.3
@@ -261,8 +264,8 @@ cglib.checksum.enabled=true
cglib.checksum.algorithm=MD5|SHA-1
cglib.checksum.value=694815351007f966c14ea093ec838323|6a4af5d9112066a5baf235fd55d5876969bc813c
cglib.home=${base.path}/cglib-${cglib.version}
-cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
+cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
objenesis.version=1.2
@@ -270,8 +273,8 @@ objenesis.checksum.enabled=true
objenesis.checksum.algorithm=SHA-1
objenesis.checksum.value=2359e04aca6f4f171f92ff77489d1669043dd536
objenesis.home=${base.path}/objenesis-${objenesis.version}
-objenesis.loc=https://bintray.com/easymock/distributions/download_file?file_path=objenesis-${objenesis.version}-bin.zip
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
+objenesis.loc=https://bintray.com/easymock/distributions/download_file?file_path=objenesis-${objenesis.version}-bin.zip
# - Checkstyle, version 6.0 or later -
# Limited to 6.1.1 since that is the latest release that supports Java 6
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated (a381fc2 -> 645f0ce)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from a381fc2 Refactor fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63205 new 383428b Clean-up. No functional change. new 02c29af Remove unused properties for long since removed module new bd84057 Update Junit to 4.12 new 9e32afa Switch Easymock and objenesis to download from Maven Central new bab1f84 Parameterise Cobertura version new bc1ef7a Remove unused property new 645f0ce Update Tomcat Native to 1.2.23 The 7 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 | 52 +- .../apache/catalina/core/AprLifecycleListener.java | 2 +- webapps/docs/changelog.xml | 6 +++ 3 files changed, 29 insertions(+), 31 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/07: Parameterise Cobertura version
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bab1f843b7c88f3ed7c976c31069e8745ad72ed0
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:48:37 2019 +0100
Parameterise Cobertura version
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 3b4c6f1..7a46224 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -298,4 +298,4 @@
cobertura.checksum.value=63a8c5b3f5c1226fcc52cc9c9ea2a812|705d23e5a8815aff3bc4ad
cobertura.home=${base.path}/cobertura-${cobertura.version}
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
cobertura.lib=${cobertura.home}/lib
-cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.0.3-bin.tar.gz
+cobertura.loc=${base-sf.loc}/cobertura/cobertura-${cobertura.version}-bin.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/07: Remove unused properties for long since removed module
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 02c29af1b2e8490e4de73e50ed37dbb0c182791e
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:43:17 2019 +0100
Remove unused properties for long since removed module
---
build.properties.default | 10 --
1 file changed, 10 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4b31cc8..662ebf1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -290,16 +290,6 @@
checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-j
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-# - JSON Libraries (for bayeux module) -
-json-lib.home=${base.path}/json-20080701
-json-lib.lib=http://repo1.maven.org/maven2/org/json/json/20080701/json-20080701.jar
-json-lib.jar=json.jar
-
-# - Dojo Toolkit (for bayeux module) -
-dojo-js.home=${base.path}/dojo-release-1.1.1
-dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.1.tar.gz
-dojo-js.jar=${dojo-js.home}/dojo/dojo.js
-
# - Cobertura code coverage tool -
cobertura.version=2.0.3
cobertura.checksum.enabled=true
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/07: Switch Easymock and objenesis to download from Maven Central
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9e32afaf34e8923b0adcbe263d1926c2bcd7d53e
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:46:39 2019 +0100
Switch Easymock and objenesis to download from Maven Central
---
build.properties.default | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 1293a1b..3b4c6f1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/ha
easymock.version=3.2
easymock.checksum.enabled=true
easymock.checksum.algorithm=MD5|SHA-1
-easymock.checksum.value=2d914151580d6749ba0921be7eda705a|9794114433b4788b5d6498164311ecb3a25ff262
+easymock.checksum.value=0da4291328e18798621c36fdf8bc4c3a|00c82f7fa3ef377d8954b1db25123944b5af2ba4
easymock.home=${base.path}/easymock-${easymock.version}
easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
-easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
+easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymock-${easymock.version}.jar
# - cglib, used by EasyMock, version 2.2 or later -
cglib.version=2.2.3
@@ -270,11 +270,11 @@
cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
# - objenesis, used by EasyMock, version 1.2 or later -
objenesis.version=1.2
objenesis.checksum.enabled=true
-objenesis.checksum.algorithm=SHA-1
-objenesis.checksum.value=2359e04aca6f4f171f92ff77489d1669043dd536
+objenesis.checksum.algorithm=MD5|SHA-1
+objenesis.checksum.value=bee117291d50b41b8e8cf0ac5435df1d|bfcb0539a071a4c5a30690388903ac48c0667f2a
objenesis.home=${base.path}/objenesis-${objenesis.version}
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
-objenesis.loc=https://bintray.com/easymock/distributions/download_file?file_path=objenesis-${objenesis.version}-bin.zip
+objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - Checkstyle, version 6.0 or later -
# Limited to 6.1.1 since that is the latest release that supports Java 6
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/07: Update Junit to 4.12
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bd840572110d14dcccabd625322ae0a6ecfb5c57
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:45:13 2019 +0100
Update Junit to 4.12
---
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 662ebf1..1293a1b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -232,10 +232,10 @@
commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/co
commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
# - JUnit Unit Test Suite, version 4.11 or later -
-junit.version=4.11
+junit.version=4.12
junit.checksum.enabled=true
junit.checksum.algorithm=MD5|SHA-1
-junit.checksum.value=3c42be5ea7cbf3635716abbb429cb90d|4e031bb61df09069aeb2bffb4019e7a5034a4ee0
+junit.checksum.value=5b38c40c97fbd0adee29f91e60405584|2973d150c0dc1fefe998f834810d68f278ea58ec
junit.home=${base.path}/junit-${junit.version}
junit.jar=${junit.home}/junit-${junit.version}.jar
junit.loc=${base-maven.loc}/junit/junit/${junit.version}/junit-${junit.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 66afc70..e464d63 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -228,6 +228,9 @@
based test fails on non-English locales. Patch provided by Radosław
Józwik. (markt)
+
+Update JUnit to version 4.12. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/07: Remove unused property
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bc1ef7a1ab3120d6ea557f91e95e1d3964091088
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:49:30 2019 +0100
Remove unused property
---
build.properties.default | 1 -
1 file changed, 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 7a46224..36f0c85 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -297,5 +297,4 @@ cobertura.checksum.algorithm=MD5|SHA-1
cobertura.checksum.value=63a8c5b3f5c1226fcc52cc9c9ea2a812|705d23e5a8815aff3bc4adafd7f3001b578b5acf
cobertura.home=${base.path}/cobertura-${cobertura.version}
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
-cobertura.lib=${cobertura.home}/lib
cobertura.loc=${base-sf.loc}/cobertura/cobertura-${cobertura.version}-bin.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/07: Update Tomcat Native to 1.2.23
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 645f0ce480b6cb07d0b5e126dfd5202d892e0f1b
Author: Mark Thomas
AuthorDate: Tue Jul 2 18:46:52 2019 +0100
Update Tomcat Native to 1.2.23
---
build.properties.default| 10 +-
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 36f0c85..a878fe4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -173,19 +173,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.21
+tomcat-native.version=1.2.23
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=7f43f815785e5bc3e43f5b2e9ad1c90576a3c1528d57230328b7175bf475eb5f4e1f91b66fae74ad32cd76f044d7705f98a79109f6f84e5af75dc32bc8830b29
+tomcat-native.src.checksum.value=89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=bd5e7bb6584cba635d780216b87d453ecca5034235f018ba8a7429b82d653aa58cf26b89520c60271e10f242bd8a10fce401f362ecfe0fab597c7b6983ad97ce
+tomcat-native.win.checksum.value=b5d91d709241fea5f18fbaf2eb1dbad3c3014309ac72dfc10c0eb7c2f926a8e37a4c326ce251552bbd2b1f15b86c84ae72c33a259cc051765ab4322c91b5721b
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1a-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1a-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.04
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 2b93bed..acf4301 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -69,7 +69,7 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MINOR = 1;
protected static final int TCN_REQUIRED_PATCH = 32;
protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 21;
+protected static final int TCN_RECOMMENDED_PV = 23;
// -- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e464d63..8aa9e63 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,6 +139,9 @@
Correct two failing tests from the Litmus test suite for WebDAV when
copying/moving a file over a collection. (markt)
+
+Update the recommended minimum Tomcat Native version to 1.2.23. (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 (2cb7cf9 -> 10a1435)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 2cb7cf9 Update Tomcat Native to 1.2.23 new ffcb173 Increment version number for next development cycle new df06867 Clean-up. No functional change new 10a1435 Parameterise Cobertura version The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 13 ++--- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 10 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Clean-up. No functional change
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit df068670aa641e9ee2ea84202f147805dd5158ea
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:37:20 2019 +0100
Clean-up. No functional change
---
build.properties.default | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b40b1de..f0fd62f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -109,8 +109,8 @@ jaxrpc-lib.checksum.enabled=true
jaxrpc-lib.checksum.algorithm=MD5|SHA-1
jaxrpc-lib.checksum.value=4bebba22a4cdb9f68e16c45129770333|fe9371d33dc3e1646d4d13bde19614283eb998b1
jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version}
-jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
jaxrpc-lib.jar=${jaxrpc-lib.home}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
+jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
# - Webservices - WSDL4J -
wsdl4j-lib.version=1.6.3
@@ -118,11 +118,11 @@ wsdl4j-lib.checksum.enabled=true
wsdl4j-lib.checksum.algorithm=MD5|SHA-1
wsdl4j-lib.checksum.value=cfc28d89625c5e88589aec7a9aee0208|6d106a6845a3d3477a1560008479312888e94f2f
wsdl4j-lib.home=${base.path}/wsdl4j-${wsdl4j-lib.version}
-wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
+wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
# - Eclipse JDT, version 4.5.1 or later -#
-# See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
+# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
# 4.6.3 is the latest release that runs on Java 7
# Later versions can be used but the official builds need to use 4.6.3
@@ -253,8 +253,8 @@ checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=MD5|SHA-1
checkstyle.checksum.value=9180ab8b8219b262bfe88f26fd95d26d|11a02d7b0374f8a82fbd76361a69756faa6aefa0
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
+checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - Cobertura code coverage tool -
cobertura.version=2.1.1
@@ -263,7 +263,6 @@ cobertura.checksum.algorithm=MD5|SHA-1
cobertura.checksum.value=4f46638aa8e4d89565c038092398ea06|99cb44d36555feedcedc46263c23c2f5394ef342
cobertura.home=${base.path}/cobertura-${cobertura.version}
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
-cobertura.lib=${cobertura.home}/lib
cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
# - Findbugs -
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Parameterise Cobertura version
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 10a143530274e579b0257d58e8abaae50c79c659
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:48:27 2019 +0100
Parameterise Cobertura version
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index f0fd62f..f30d21e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -263,7 +263,7 @@ cobertura.checksum.algorithm=MD5|SHA-1
cobertura.checksum.value=4f46638aa8e4d89565c038092398ea06|99cb44d36555feedcedc46263c23c2f5394ef342
cobertura.home=${base.path}/cobertura-${cobertura.version}
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
-cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
+cobertura.loc=${base-sf.loc}/cobertura/cobertura-${cobertura.version}-bin.tar.gz
# - Findbugs -
findbugs.version=3.1.12
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Parameterise Cobertura version
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new b5fd430 Parameterise Cobertura version
b5fd430 is described below
commit b5fd430957c8e2f4dc5b4e167f37c0e680063e6f
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:48:04 2019 +0100
Parameterise Cobertura version
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 290d603..9c31c8b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -261,7 +261,7 @@ cobertura.checksum.algorithm=MD5|SHA-1
cobertura.checksum.value=4f46638aa8e4d89565c038092398ea06|99cb44d36555feedcedc46263c23c2f5394ef342
cobertura.home=${base.path}/cobertura-${cobertura.version}
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
-cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
+cobertura.loc=${base-sf.loc}/cobertura/cobertura-${cobertura.version}-bin.tar.gz
# - Findbugs -
findbugs.version=3.1.12
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Refactor APR poller to remove use of multiple pollsets
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 57adb59 Refactor APR poller to remove use of multiple pollsets
57adb59 is described below
commit 57adb595bb8b2a0c01367ddaf39d5513c6f3aa28
Author: Mark Thomas
AuthorDate: Fri Jul 5 13:14:12 2019 +0100
Refactor APR poller to remove use of multiple pollsets
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 403 +--
webapps/docs/changelog.xml | 9 +
2 files changed, 161 insertions(+), 251 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 5cb6b78..1caa5e7 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -976,36 +976,14 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
public class Poller implements Runnable {
/**
- * Pointers to the pollers.
+ * Pointer to the poller.
*/
-private long[] pollers = null;
+private long aprPoller;
/**
* Actual poller size.
*/
-private int actualPollerSize = 0;
-
-/**
- * Amount of spots left in the poller.
- */
-private int[] pollerSpace = null;
-
-/**
- * Amount of low level pollers in use by this poller.
- */
-private int pollerCount;
-
-/**
- * Timeout value for the poll call.
- */
-private int pollerTime;
-
-/**
- * Variable poller timeout that adjusts depending on how many poll sets
- * are in use so that the total poll time across all poll sets remains
- * equal to pollTime.
- */
-private int nextPollerTime;
+private int pollerSize = 0;
/**
* Root pool.
@@ -1059,55 +1037,18 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
private volatile boolean pollerRunning = true;
/**
- * Create the poller. With some versions of APR, the maximum poller
size
- * will be 62 (recompiling APR is necessary to remove this limitation).
+ * Create the poller.
*/
protected synchronized void init() {
pool = Pool.create(serverSockPool);
-
-// Single poller by default
-int defaultPollerSize = getMaxConnections();
-
-if ((OS.IS_WIN32 || OS.IS_WIN64) && (defaultPollerSize > 1024)) {
-// The maximum per poller to get reasonable performance is 1024
-// Adjust poller size so that it won't reach the limit. This is
-// a limitation of XP / Server 2003 that has been fixed in
-// Vista / Server 2008 onwards.
-actualPollerSize = 1024;
-} else {
-actualPollerSize = defaultPollerSize;
-}
-
-timeouts = new SocketTimeouts(defaultPollerSize);
+pollerSize = getMaxConnections();
+timeouts = new SocketTimeouts(pollerSize);
// At the moment, setting the timeout is useless, but it could get
// used again as the normal poller could be faster using maintain.
// It might not be worth bothering though.
-long pollset = allocatePoller(actualPollerSize, pool, -1);
-if (pollset == 0 && actualPollerSize > 1024) {
-actualPollerSize = 1024;
-pollset = allocatePoller(actualPollerSize, pool, -1);
-}
-if (pollset == 0) {
-actualPollerSize = 62;
-pollset = allocatePoller(actualPollerSize, pool, -1);
-}
-
-pollerCount = defaultPollerSize / actualPollerSize;
-pollerTime = pollTime / pollerCount;
-nextPollerTime = pollerTime;
-
-pollers = new long[pollerCount];
-pollers[0] = pollset;
-for (int i = 1; i < pollerCount; i++) {
-pollers[i] = allocatePoller(actualPollerSize, pool, -1);
-}
-
-pollerSpace = new int[pollerCount];
-for (int i = 0; i < pollerCount; i++) {
-pollerSpace[i] = actualPollerSize;
-}
+aprPoller = allocatePoller(pollerSize, pool, -1);
/*
* x2 - One descriptor for the socket, one for the event(s).
@@ -1118,10 +1059,10 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
*
* Therefore size is actual poller size *4.
*/
-desc = new long[actualPollerSize * 4];
+desc = new long[pollerSize * 4];
connectionCount.set(0);
-addList = new
[Bug 63524] Private key must be accompanied by certificate chain
https://bz.apache.org/bugzilla/show_bug.cgi?id=63524 --- Comment #15 from Mark Thomas --- My public keys for ma...@apache.org are listed here: http://people.apache.org/keys/committer/ The first one (A9C5 ...) is my preferred one. -- 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 34150] child pid # exit signal Segmentation fault (11)
https://bz.apache.org/bugzilla/show_bug.cgi?id=34150 abhishek.pa...@diligenta.co.uk changed: What|Removed |Added CC||abhishek.pa...@diligenta.co ||.uk -- 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 9.0.22
Am 04.07.2019 um 21:33 schrieb Mark Thomas: The proposed Apache Tomcat 9.0.22 release is now available for voting. The major changes compared to the 9.0.21 release are: - Add user buildable optional modules for easier CDI 2 and JAX-RS support. Also include a new documentation page describing how to use it. - Update to Tomcat Native 1.2.23 including Windows binaries built with OpenSSL 1.1.1c - Update to Eclipse Complier for Java 4.12 Along with lots of other bug fixes and improvements. For full details, see the changelog: https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.22/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1215/ The tag is: https://github.com/apache/tomcat/tree/9.0.22 95f7f98eef1d3521ee25617c07a36d22daba84ea The proposed 9.0.22 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 9.0.22 Trying to build it, the commons-daemon download failed, because some mirrors seem to have ony 1.2.0, eg. http://mirror.dkd.de/apache/commons/daemon/source/. Probably not a showstopper, but I wanted to mention it in case the update to 1.2.0 should have been included. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63524] Private key must be accompanied by certificate chain
https://bz.apache.org/bugzilla/show_bug.cgi?id=63524 --- Comment #14 from Arnaud Kleinveld --- Perhaps I can send to your email if you have a personal public key. -- 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 8.5.43
On 04/07/2019 22:19, Mark Thomas wrote: > The proposed 8.5.43 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.43 Unit tests passed for NIO, NIO2 and APR/native (1.2.23) on Linux, Windows and MacOS. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.22
On 04/07/2019 20:33, Mark Thomas wrote: > The proposed 9.0.22 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.22 Unit tests passed for NIO, NIO2 and APR/native (1.2.23) on Linux, Windows and MacOS. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63524] Private key must be accompanied by certificate chain
https://bz.apache.org/bugzilla/show_bug.cgi?id=63524 --- Comment #13 from Mark Thomas --- There isn't much in the way of logging to enable that would help here. What we really need is a set of keys/certs to reproduce the issue. The simple solution (send me the keys/certs you are having the issue with) isn't really an option unless you really, really trust me since it means handing over your current private key(s). Not something I'd recommend. Are you able to recreate the issue on a test server, revoke the cert(s) and then send me the files? Another option would be to create a set of problematic keys/certs from scratch with OpenSSL and then add the steps to re-create those test files to this issue. -- 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 63524] Private key must be accompanied by certificate chain
https://bz.apache.org/bugzilla/show_bug.cgi?id=63524 --- Comment #12 from Arnaud Kleinveld --- Hi, sorry for my late reply. I have gone through various options but I don't see how I can reproduce this error. The Apache httpd server is using the same certificates without any issues. Is there some kind of verbose logging I can filter on Tomcat that will help you? -- 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
