[Bug 64514] classes missing from bootstrap.jar

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64514

--- Comment #1 from rotty3000  ---
https://github.com/apache/tomcat/pull/296

-- 
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 64513] bndlib is not needed

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64513

--- Comment #1 from rotty3000  ---
https://github.com/apache/tomcat/pull/295

-- 
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 64515] no need to filter bnd files (bnd passes ant properties in)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64515

--- Comment #1 from rotty3000  ---
https://github.com/apache/tomcat/pull/297

-- 
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

[GitHub] [tomcat] rotty3000 opened a new pull request #297: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties…

[GitBox]

rotty3000 opened a new pull request #297:
URL: https://github.com/apache/tomcat/pull/297


   … in)no need to filter bnd files (bnd passes ant properties in)
   
   Signed-off-by: Raymond Augé 



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.

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

[Bug 64515] New: no need to filter bnd files (bnd passes ant properties in)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64515

Bug ID: 64515
   Summary: no need to filter bnd files (bnd passes ant properties
in)
   Product: Tomcat 10
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: raymond.a...@liferay.com
  Target Milestone: --

-- 
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

[GitHub] [tomcat] rotty3000 opened a new pull request #296: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

rotty3000 opened a new pull request #296:
URL: https://github.com/apache/tomcat/pull/296


   Signed-off-by: Raymond Augé 



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.

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

[Bug 64514] classes missing from bootstrap.jar

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64514

rotty3000  changed:

   What|Removed |Added

   Hardware|PC  |All
 OS|Linux   |All

-- 
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 64514] New: classes missing from bootstrap.jar

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64514

Bug ID: 64514
   Summary: classes missing from bootstrap.jar
   Product: Tomcat 10
   Version: unspecified
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: raymond.a...@liferay.com
  Target Milestone: --

When performing a jdeps analysis on bootstrap.jar in master we can see that
there are two classes missing.

> tomcat]$ jdeps -v -cp output/build/bin/tomcat-juli.jar 
> output/build/bin/bootstrap.jar | grep "not found"
> bootstrap.jar -> not found
>org.apache.catalina.startup.Bootstrap  -> 
> org.apache.catalina.Globalsnot found
>org.apache.catalina.startup.Tool   -> 
> org.apache.catalina.Globalsnot found
>org.apache.catalina.startup.Tool   -> 
> org.apache.tomcat.util.ExceptionUtils  not found

The effective result of this is that when calculating either the OSGi or JPMS
metadata these packages want to be imported. Since several other classes are
cherry-picked into the jar it stands to reason that the assembly should be
logically complete as to never encounter any hard to diagnose errors.

-- 
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

[GitHub] [tomcat] rotty3000 opened a new pull request #295: Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everyw…

[GitBox]

rotty3000 opened a new pull request #295:
URL: https://github.com/apache/tomcat/pull/295


   …here
   
   Signed-off-by: Raymond Augé 



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.

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

[Bug 64513] New: bndlib is not needed

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64513

Bug ID: 64513
   Summary: bndlib is not needed
   Product: Tomcat 10
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: trivial
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: raymond.a...@liferay.com
  Target Milestone: --

Remove bndlib from build since it's not needed.

-- 
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 64509] Rfc6265CookieProcessor mishandles commas in $Version=1 cookie header

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64509

--- Comment #3 from WJCarpenter  ---
Thanks for the quick action on this.

-- 
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 64509] Rfc6265CookieProcessor mishandles commas in $Version=1 cookie header

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64509

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M7 onwards
- 9.0.x for 9.0.37 onwards
- 8.5.x for 8.5.57 onwards

7.0.x is not affected.

Thanks for the report. You were right about the location of the bug. There were
a couple of other places the same bug was present. I've fixed them an added a
parameterised test case that should test all combinations.

-- 
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: Fix BZ 64509 - Correctly parse RFC 2109

[markt]

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 640b789  Fix BZ 64509 - Correctly parse RFC 2109
640b789 is described below

commit 640b78973e307c31a181f8a94bdb8305605a9c86
Author: Mark Thomas 
AuthorDate: Wed Jun 10 20:53:46 2020 +0100

Fix BZ 64509 - Correctly parse RFC 2109
---
 .../org/apache/tomcat/util/http/parser/Cookie.java |  9 +-
 .../apache/tomcat/util/http/parser/TestCookie.java | 96 ++
 webapps/docs/changelog.xml |  5 ++
 3 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/Cookie.java 
b/java/org/apache/tomcat/util/http/parser/Cookie.java
index 17410f8..181e052 100644
--- a/java/org/apache/tomcat/util/http/parser/Cookie.java
+++ b/java/org/apache/tomcat/util/http/parser/Cookie.java
@@ -274,8 +274,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
@@ -303,8 +304,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
@@ -333,8 +335,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
diff --git a/test/org/apache/tomcat/util/http/parser/TestCookie.java 
b/test/org/apache/tomcat/util/http/parser/TestCookie.java
new file mode 100644
index 000..c97e587
--- /dev/null
+++ b/test/org/apache/tomcat/util/http/parser/TestCookie.java
@@ -0,0 +1,96 @@
+/*
+ *  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
+ *  limitations under the License.
+ */
+package org.apache.tomcat.util.http.parser;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.tomcat.util.http.ServerCookies;
+
+@RunWith(Parameterized.class)
+public class TestCookie {
+
+@Parameterized.Parameters(name = "{index}: header[{0}]")
+public static Collection parameters() {
+
+List parameterSets = new ArrayList<>();
+
+String[] SEPS = new String[] { ",", ";" };
+String[] PATHS = new String[] { ";$Path=/foo", ""};
+String[] DOMAINS = new String[] { ";$Domain=bar.com", ""};
+
+for (String sep1 : SEPS) {
+for (String path1 : PATHS) {
+for (String domain1 : DOMAINS) {
+for (String sep2 : SEPS) {
+for (String path2 : PATHS) {
+for (String domain2 : DOMAINS) {
+for (String sep3 : SEPS) {
+for (String path3 : PATHS) {
+for (String domain3 : DOMAINS) {
+  

[tomcat] branch 9.0.x updated: Fix BZ 64509 - Correctly parse RFC 2109

[markt]

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 6e43876  Fix BZ 64509 - Correctly parse RFC 2109
6e43876 is described below

commit 6e4387675f5343e6d489663ae03f5700bdc52cc2
Author: Mark Thomas 
AuthorDate: Wed Jun 10 20:53:46 2020 +0100

Fix BZ 64509 - Correctly parse RFC 2109
---
 .../org/apache/tomcat/util/http/parser/Cookie.java |  9 +-
 .../apache/tomcat/util/http/parser/TestCookie.java | 96 ++
 webapps/docs/changelog.xml |  5 ++
 3 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/Cookie.java 
b/java/org/apache/tomcat/util/http/parser/Cookie.java
index 17410f8..181e052 100644
--- a/java/org/apache/tomcat/util/http/parser/Cookie.java
+++ b/java/org/apache/tomcat/util/http/parser/Cookie.java
@@ -274,8 +274,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
@@ -303,8 +304,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
@@ -333,8 +335,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
diff --git a/test/org/apache/tomcat/util/http/parser/TestCookie.java 
b/test/org/apache/tomcat/util/http/parser/TestCookie.java
new file mode 100644
index 000..c97e587
--- /dev/null
+++ b/test/org/apache/tomcat/util/http/parser/TestCookie.java
@@ -0,0 +1,96 @@
+/*
+ *  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
+ *  limitations under the License.
+ */
+package org.apache.tomcat.util.http.parser;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.tomcat.util.http.ServerCookies;
+
+@RunWith(Parameterized.class)
+public class TestCookie {
+
+@Parameterized.Parameters(name = "{index}: header[{0}]")
+public static Collection parameters() {
+
+List parameterSets = new ArrayList<>();
+
+String[] SEPS = new String[] { ",", ";" };
+String[] PATHS = new String[] { ";$Path=/foo", ""};
+String[] DOMAINS = new String[] { ";$Domain=bar.com", ""};
+
+for (String sep1 : SEPS) {
+for (String path1 : PATHS) {
+for (String domain1 : DOMAINS) {
+for (String sep2 : SEPS) {
+for (String path2 : PATHS) {
+for (String domain2 : DOMAINS) {
+for (String sep3 : SEPS) {
+for (String path3 : PATHS) {
+for (String domain3 : DOMAINS) {
+

[tomcat] branch 8.5.x updated: Fix BZ 64509 - Correctly parse RFC 2109

[markt]

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 496cc6c  Fix BZ 64509 - Correctly parse RFC 2109
496cc6c is described below

commit 496cc6c74c2420dc61ce6803641f00d1fa337c46
Author: Mark Thomas 
AuthorDate: Wed Jun 10 20:53:46 2020 +0100

Fix BZ 64509 - Correctly parse RFC 2109
---
 .../org/apache/tomcat/util/http/parser/Cookie.java |  9 +-
 .../apache/tomcat/util/http/parser/TestCookie.java | 96 ++
 webapps/docs/changelog.xml |  5 ++
 3 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/Cookie.java 
b/java/org/apache/tomcat/util/http/parser/Cookie.java
index be29c31..895ce64 100644
--- a/java/org/apache/tomcat/util/http/parser/Cookie.java
+++ b/java/org/apache/tomcat/util/http/parser/Cookie.java
@@ -275,8 +275,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
@@ -304,8 +305,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
@@ -334,8 +336,9 @@ public class Cookie {
 skipResult = skipByte(bb, COMMA_BYTE);
 if (skipResult == SkipResult.FOUND) {
 parseAttributes = false;
+} else {
+skipResult = skipByte(bb, SEMICOLON_BYTE);
 }
-skipResult = skipByte(bb, SEMICOLON_BYTE);
 if (skipResult == SkipResult.EOF) {
 parseAttributes = false;
 moreToProcess = false;
diff --git a/test/org/apache/tomcat/util/http/parser/TestCookie.java 
b/test/org/apache/tomcat/util/http/parser/TestCookie.java
new file mode 100644
index 000..c97e587
--- /dev/null
+++ b/test/org/apache/tomcat/util/http/parser/TestCookie.java
@@ -0,0 +1,96 @@
+/*
+ *  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
+ *  limitations under the License.
+ */
+package org.apache.tomcat.util.http.parser;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.tomcat.util.http.ServerCookies;
+
+@RunWith(Parameterized.class)
+public class TestCookie {
+
+@Parameterized.Parameters(name = "{index}: header[{0}]")
+public static Collection parameters() {
+
+List parameterSets = new ArrayList<>();
+
+String[] SEPS = new String[] { ",", ";" };
+String[] PATHS = new String[] { ";$Path=/foo", ""};
+String[] DOMAINS = new String[] { ";$Domain=bar.com", ""};
+
+for (String sep1 : SEPS) {
+for (String path1 : PATHS) {
+for (String domain1 : DOMAINS) {
+for (String sep2 : SEPS) {
+for (String path2 : PATHS) {
+for (String domain2 : DOMAINS) {
+for (String sep3 : SEPS) {
+for (String path3 : PATHS) {
+for (String domain3 : DOMAINS) {
+

[tomcat] branch 8.5.x updated: Fix back-port error

[markt]

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 d4f1aa1  Fix back-port error
d4f1aa1 is described below

commit d4f1aa132469fbdf78a8900b62d298f494f9159a
Author: Mark Thomas 
AuthorDate: Wed Jun 10 20:50:32 2020 +0100

Fix back-port error
---
 webapps/docs/changelog.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e19e8c..e034840 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -82,7 +82,6 @@
   
 
   
->>> 4bd5c80e60... Fix BZ64501 - Avoid feature not available by default on 
Solaris 10
 
 
   


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

[Bug 64506] NullPointerException when loading webapp class

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64506

--- Comment #5 from Arvind Talari  ---
Hmmm.. actually may be it is not required, since
org.apache.catalina.webresources.CachedResource#validateResources isn't
conditionally validating.

-- 
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 64506] NullPointerException when loading webapp class

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64506

--- Comment #4 from Arvind Talari  ---
Thank you Mark for the quick turn around.
Yes, we are able to build from source, being a race condition it isn't
reproducible at will, we will need to manually simulate the race condition.

Although, we haven't run into this issue, I am also wondering if a similar fix
needs to be made in org.apache.catalina.webresources.Cache#getResources.

-- 
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: Support for LetsEncrypt certs, and update process, in Tomcat without restart.

[Merlin Beedell]

Well thanks Christopher - that presentation link was just what I needed (well - 
it was your presentation after all!). Really good.  Ideally this could be 
written into the Tomcat standard Documentation, as it will crop up quite a bit.

In summary, 3 steps:

  1.  Fetch cert update (requires port 80).

- certbot-auto renew

  1.  Reformat for Tomcat usage [might be natively handled in later Tomcat 
releases?]

- openssl pkcs12 -export -in [cert] -inkey [key] -certfile [chain] -out 
[p12file]

  1.  Use JMX to flush/reload the SSH Host config (including cipher list & 
protocol level) at runtime.

- 
https://localhost/manager/jmxproxy?invoke=Catalina:type=ProtocolHandler,port=8443,address="127.0.0.1"=reloadSslHostConfigs



Merlin Beedell

-Original Message-

From: Christopher Schultz 

Sent: 08 June 2020 9:14 PM

To: Tomcat Developers List ; Merlin Beedell 


Subject: Re: Support for LetsEncrypt certs, and update process, in Tomcat 
without restart.



-BEGIN PGP SIGNED MESSAGE-

Hash: SHA256



Merlin,



On 6/8/20 10:17, Merlin Beedell wrote:

> I am getting a lot of flack from some senior devs who insist that

> Tomcat must be put behind a Proxy - HA Proxy or Nginx, which will

> handle the SSL offloading etc.

>

> While this seems sensible for multi-server environments, they want it

> for single server too.  But Tomcat can do all the things that are

> required:

>

> * Certificate handling. * TLS level and Cipher restrictions * CORS

> handling (though this could be simpler!)

>

> But now with the requirement for LetsEncrypt certificates, we find

> that Tomcat has to be restarted every 3 months.  Indeed - any changes

> to the above require tomcat restarts - and that is found to be

> unacceptable.



Nonsense.



http://tomcat.apache.org/presentations.html#latest-lets-encrypt



Updating CORS configuration may require a redeployment of your web application, 
but it does not require Tomcat to be shut-down.



There are other reasons to use a reverse proxy in front of Tomcat, but none of 
the above are good reasons.



> So what I really want to understand is if Tomcat has any plans to

> include the ability to restart an https connector WITHOUT needing to

> restart the whole of Tomcat.  Better still, a hook that would help

> refresh certificates - like LetsEncrypt.

>

> https://stackoverflow.com/questions/43571572/programmatically-update-certificates-in-tomcat-8-without-server-restart



There

>

are no currently-correct answers to that question.



I can fix that.



- -chris

-BEGIN PGP SIGNATURE-

Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/



iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl7em/oACgkQHPApP6U8

pFiuqw//SfBmQ4eMhXUw0WkiQ5Fe9dJIa724h0wv60ghJQK80n9cu7CdcB9om9R4

w4tbhvxkBCc/ENBQP2gfszRwT8Y7EleyDTY09OKaQ1aiqgnWaE4hj2Srmoi/kUFi

LAbgNm/vpHzTS/ozp3+T/vD8GtLHc1UXDnsKY3zzMc8CFgRo10YDyAMJoC8S4SGe

1Ji4NF1uY2aqeY7LPBMDU1IrQTK4EW2SNFV9JSyEjsPBB8yKCzvGdCJRPvJih/mg

ZsTI6w/X2cldSbVvpAUh5hOUglo8+5BqN2W1aOKttwxbds/KbckQg5vOHs4+sCPk

M6ngE0sYggz2JsF/IZQ9PtMDtuZdKxmCWsXwbTw7G5qpjv6RWQW2GtMl52d1qabO

Xna7npVd1kiGOvA/uuNPxI7Z3qOhYiCs78JCG6oaUQejqywgvKO4HyibNlFJD1F+

P3S/SLuxQB7uhC5CuY3wKXckJEbGbL7D04wkCY90N1q5PQO0oy5j/jyS3y6cDmHw

SZNuH3Gvc7WUE8xbJNx5W8fP9m5mpwAJ0lwcCgqN8zqUEqbbE4imrMOrVxjmqPiT

V/jySH8D0ckk+jyQ8gADmId8vGF5KrQCrfTwxjpLhxSuEZ+cB3d7tsOCCI6Xw9o1

ShMM500fXsMgHkrhyqg7gG6Pf7zVutqhgOBkUZUntFkuMEB38Ow=

=O9u2

-END PGP SIGNATURE-

[Bug 64509] Rfc6265CookieProcessor mishandles commas in $Version=1 cookie header

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64509

Mark Thomas  changed:

   What|Removed |Added

Version|9.0.33  |9.0.36

--- Comment #1 from Mark Thomas  ---
Thanks for the reminder. I've added 9.0.36 to the list of versions and updated
the version for this issue. I'll look at the detail of the report next.

-- 
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 64506] NullPointerException when loading webapp class

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64506

Mark Thomas  changed:

   What|Removed |Added

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

-- 
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 64506] NullPointerException when loading webapp class

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64506

--- Comment #3 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M7 onwards
- 9.0.x for 9.0.37 onwards
- 8.5.x for 8.5.57 onwards

7.0.x is not affected.

It would be great if you were able to test this. Our you able to build Tomcat
from source? If not, I can provide a snapshot build for you to test.

-- 
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 9.0.x updated: Fix BZ 64506 Correct race condition on resource lookup

[markt]

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 6efae2f  Fix BZ 64506 Correct race condition on resource lookup
6efae2f is described below

commit 6efae2f5c619e17863a040045f272e29ec8e2c19
Author: Mark Thomas 
AuthorDate: Wed Jun 10 17:17:20 2020 +0100

Fix BZ 64506 Correct race condition on resource lookup

https://bz.apache.org/bugzilla/show_bug.cgi?id=64506
---
 java/org/apache/catalina/webresources/Cache.java   | 18 ++
 .../apache/catalina/webresources/CachedResource.java   |  5 +
 webapps/docs/changelog.xml |  5 +
 3 files changed, 28 insertions(+)

diff --git a/java/org/apache/catalina/webresources/Cache.java 
b/java/org/apache/catalina/webresources/Cache.java
index 2494527..b2ce23c 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -108,6 +108,24 @@ public class Cache {
 }
 } else {
 // Another thread added the entry to the cache
+if (cacheEntry.usesClassLoaderResources() != 
useClassLoaderResources) {
+// Race condition adding cache entries with the same path
+// but differing values for useClassLoaderResources.
+// Cache only supports one entry per path with one value of
+// useClassLoaderResources.
+// Let the other thread "win" and add the resource to the
+// cache. This thread will receive a cacheEntry instance
+// that isn't added to the cache.
+// There are assumptions here. They are:
+// - refactoring the Cache to use a combined key of
+//   path+useClassLoaderResources adds unnecessary
+//   complexity
+// - the race condition is rare (over the lifetime of an
+//   application)
+// - it would be rare for an application to need to cache a
+//   resource for both values of useClassLoaderResources
+cacheEntry = newCacheEntry;
+}
 // Make sure it is validated
 cacheEntry.validateResource(useClassLoaderResources);
 }
diff --git a/java/org/apache/catalina/webresources/CachedResource.java 
b/java/org/apache/catalina/webresources/CachedResource.java
index b77862a..db4c6d5 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -404,6 +404,11 @@ public class CachedResource implements WebResource {
 return webResources;
 }
 
+boolean usesClassLoaderResources() {
+return usesClassLoaderResources;
+}
+
+
 // Assume that the cache entry will always include the content unless the
 // resource content is larger than objectMaxSizeBytes. This isn't always 
the
 // case but it makes tracking the current cache size easier.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 11a4233..b4522de 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -57,6 +57,11 @@
 Implement a significant portion of the TLS environment variables for
 the rewrite valve. (remm)
   
+  
+64506: Correct a potential race condition in the resource
+cache implementation that could lead to
+NullPointerExceptions during class loading. (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: Fix BZ 64506 Correct race condition on resource lookup

[markt]

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 3dc63ee  Fix BZ 64506 Correct race condition on resource lookup
3dc63ee is described below

commit 3dc63ee9b555aa58fec3f5cb52e083b12dc6ac85
Author: Mark Thomas 
AuthorDate: Wed Jun 10 17:17:20 2020 +0100

Fix BZ 64506 Correct race condition on resource lookup

https://bz.apache.org/bugzilla/show_bug.cgi?id=64506
---
 java/org/apache/catalina/webresources/Cache.java   | 18 ++
 .../apache/catalina/webresources/CachedResource.java   |  5 +
 webapps/docs/changelog.xml |  5 +
 3 files changed, 28 insertions(+)

diff --git a/java/org/apache/catalina/webresources/Cache.java 
b/java/org/apache/catalina/webresources/Cache.java
index 2494527..b2ce23c 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -108,6 +108,24 @@ public class Cache {
 }
 } else {
 // Another thread added the entry to the cache
+if (cacheEntry.usesClassLoaderResources() != 
useClassLoaderResources) {
+// Race condition adding cache entries with the same path
+// but differing values for useClassLoaderResources.
+// Cache only supports one entry per path with one value of
+// useClassLoaderResources.
+// Let the other thread "win" and add the resource to the
+// cache. This thread will receive a cacheEntry instance
+// that isn't added to the cache.
+// There are assumptions here. They are:
+// - refactoring the Cache to use a combined key of
+//   path+useClassLoaderResources adds unnecessary
+//   complexity
+// - the race condition is rare (over the lifetime of an
+//   application)
+// - it would be rare for an application to need to cache a
+//   resource for both values of useClassLoaderResources
+cacheEntry = newCacheEntry;
+}
 // Make sure it is validated
 cacheEntry.validateResource(useClassLoaderResources);
 }
diff --git a/java/org/apache/catalina/webresources/CachedResource.java 
b/java/org/apache/catalina/webresources/CachedResource.java
index b77862a..db4c6d5 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -404,6 +404,11 @@ public class CachedResource implements WebResource {
 return webResources;
 }
 
+boolean usesClassLoaderResources() {
+return usesClassLoaderResources;
+}
+
+
 // Assume that the cache entry will always include the content unless the
 // resource content is larger than objectMaxSizeBytes. This isn't always 
the
 // case but it makes tracking the current cache size easier.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3bd7d26..4e19e8c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -57,6 +57,11 @@
 Implement a significant portion of the TLS environment variables for
 the rewrite valve. (remm)
   
+  
+64506: Correct a potential race condition in the resource
+cache implementation that could lead to
+NullPointerExceptions during class loading. (markt)
+  
 
   
   


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

[tomcat] branch master updated: Fix BZ 64506 Correct race condition on resource lookup

[markt]

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 752f0b9  Fix BZ 64506 Correct race condition on resource lookup
752f0b9 is described below

commit 752f0b9f9e39e838e87524dded19075cc5ff8e30
Author: Mark Thomas 
AuthorDate: Wed Jun 10 17:17:20 2020 +0100

Fix BZ 64506 Correct race condition on resource lookup

https://bz.apache.org/bugzilla/show_bug.cgi?id=64506
---
 java/org/apache/catalina/webresources/Cache.java   | 18 ++
 .../apache/catalina/webresources/CachedResource.java   |  5 +
 webapps/docs/changelog.xml |  5 +
 3 files changed, 28 insertions(+)

diff --git a/java/org/apache/catalina/webresources/Cache.java 
b/java/org/apache/catalina/webresources/Cache.java
index 2494527..b2ce23c 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -108,6 +108,24 @@ public class Cache {
 }
 } else {
 // Another thread added the entry to the cache
+if (cacheEntry.usesClassLoaderResources() != 
useClassLoaderResources) {
+// Race condition adding cache entries with the same path
+// but differing values for useClassLoaderResources.
+// Cache only supports one entry per path with one value of
+// useClassLoaderResources.
+// Let the other thread "win" and add the resource to the
+// cache. This thread will receive a cacheEntry instance
+// that isn't added to the cache.
+// There are assumptions here. They are:
+// - refactoring the Cache to use a combined key of
+//   path+useClassLoaderResources adds unnecessary
+//   complexity
+// - the race condition is rare (over the lifetime of an
+//   application)
+// - it would be rare for an application to need to cache a
+//   resource for both values of useClassLoaderResources
+cacheEntry = newCacheEntry;
+}
 // Make sure it is validated
 cacheEntry.validateResource(useClassLoaderResources);
 }
diff --git a/java/org/apache/catalina/webresources/CachedResource.java 
b/java/org/apache/catalina/webresources/CachedResource.java
index b77862a..db4c6d5 100644
--- a/java/org/apache/catalina/webresources/CachedResource.java
+++ b/java/org/apache/catalina/webresources/CachedResource.java
@@ -404,6 +404,11 @@ public class CachedResource implements WebResource {
 return webResources;
 }
 
+boolean usesClassLoaderResources() {
+return usesClassLoaderResources;
+}
+
+
 // Assume that the cache entry will always include the content unless the
 // resource content is larger than objectMaxSizeBytes. This isn't always 
the
 // case but it makes tracking the current cache size easier.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ca6f079..d774490 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,11 @@
   
 Add the Jakarta EE 9 schema. (markt)
   
+  
+64506: Correct a potential race condition in the resource
+cache implementation that could lead to
+NullPointerExceptions during class loading. (markt)
+  
 
   
   


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

buildbot success in on tomcat-85-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2350

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 990450720bf668ad4f9699cbd40e005d449dc559
Blamelist: Martin Tzvetanov Grigorov 

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: Improving OSGi/bnd build and much more...

[Mark Thomas]

On 10/06/2020 14:36, Raymond Auge wrote:
> Thanks for the feedback. I'll look at each point carefully.
> 
> I can report though that tests are looking relatively good. Only a few
> failures:
> 
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.APR.txt:Tests
> run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.057 sec
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt:Tests run:
> 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.054 sec
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt:Tests
> run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.057 sec
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.APR.txt:Tests
> run: 86, Failures: 10, Errors: 0, Skipped: 1, Time elapsed: 0.283 sec
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO2.txt:Tests
> run: 86, Failures: 10, Errors: 0, Skipped: 1, Time elapsed: 0.287 sec
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO.txt:Tests
> run: 86, Failures: 10, Errors: 0, Skipped: 1, Time elapsed: 0.281 sec

Probably related to the OpenSSL version in place. The tests are
sensitive to differences in OpenSSL provided by various distributions.

> TEST-org.apache.tomcat.util.res.TestStringManager.APR.txt:Tests run: 5,
> Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec
> TEST-org.apache.tomcat.util.res.TestStringManager.NIO2.txt:Tests run: 5,
> Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec
> TEST-org.apache.tomcat.util.res.TestStringManager.NIO.txt:Tests run: 5,
> Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec

Those look worthy of investigation.

Mark


> 
> :)
> 
> On Tue, Jun 9, 2020 at 2:54 PM Mark Thomas  > wrote:
> 
> On 09/06/2020 18:37, Raymond Auge wrote:
> > Hey All (particularly Markt whom I spoke with about this months and
> > months ago),
> >
> > Noting that bnd was already added to the build I took a crack at
> making
> > better use of it.
> >
> > Here are a few items and some questions in no particular order:
> >
> > - you don't use bndlib, can we remove that? bnd is fully
> standalone for
> > your purposes and is all you need
> 
> If we don't need it then +1 to dropping it.
> 
> > - bootstrap.jar in master seems to be missing the class
> > `org.apache.tomcat.util.ExceptionUtils` at least from a dependency
> > analysis point of view, should it be included in the files list?
> 
> No sure. That needs some more careful thought / analysis.
> 
> > - tomcat-embed-core.jar appears to be missing tribes dependency (at
> > least it refers to it but does not include it) Shouldn't it really
> > contain all of catalina (minus catalina-ant?)
> 
> That is deliberate.
> 
> > - files.tomcat-embed-core seems to reference an old package
> > org/apache/jk/**, can we remove that?
> 
> Yes, that can be removed.
> 
> > - I've split out the i18n LocalStrings_* (the locale specific
> ones) into
> > a separate output dir so that you wouldn't have to then filter
> them out,
> > it makes building their zips also cleaner, does that sound logical?
> 
> I'd want to see the patch for that first.
> 
> > - I moved a slew of concerns that bnd could handle out of ant and
> > directly into the bnd configurations, manifest filtering, etc.,
> bnd has
> > filtering capability built in and knows about all ant properties
> so this
> > eliminates ant work, comments on that?
> 
> Again, I'd want to see the patch for that.
> 
> > - generated all the Name sections for spec API packages instead of
> > maintaining those by hand (now they are complete)
> 
> Sounds good.
> 
> > - add all the correct OSGi metadata of course to the spec jars and to
> > everyone else.
> 
> Sounds good. Note the naming convention may have changed in the move
> from Java EE to Jakarta EE.
> 
> > - I've added bnd's JPMS build support to all the modules, still builds
> > on Java 8, and you get JPMS module-info almost for free (very small
> > amount of configurable bits)
> 
> Generally sounds good. My only concern is consistency for the spec JARs.
> 
> > Could someone provide the build instruction I'd need to do the most
> > throughout test build? I see that there's a .travis script which does
> > `ant -q test 2>&1 > ant-test.log` is that really all?
> 
> Yes, assuming you have properties set to point to a valid Tomcat Native
> build.
> 
> > Shall I create an SVN branch to explore this? Or would a git PR be
> enough?
> 
> I'd recommend tacking this one issue at a time. PRs would be fine for
> that. Some should be pretty quick.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: 

[tomcat] 01/02: Update the version of Objenesis for IDEA project template

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

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

commit 600d061bb5a642afc9e1e0641f4a2d6093e2311e
Author: Martin Tzvetanov Grigorov 
AuthorDate: Wed Jun 10 16:37:36 2020 +0300

Update the version of Objenesis for IDEA project template
---
 res/ide-support/idea/tomcat.iml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 16775d5..94f0130 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -104,7 +104,7 @@
 
   
 
-  
+  
 
 
 


-
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 (9904507 -> 3a7bdc9)

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 9904507  Downgrade Objenesis to 2.6
 new 600d061  Update the version of Objenesis for IDEA project template
 new 3a7bdc9  Fix the version of the Eclipse compiler for the IDEA project 
template

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:
 res/ide-support/idea/tomcat.iml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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

[tomcat] 02/02: Fix the version of the Eclipse compiler for the IDEA project template

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

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

commit 3a7bdc979abb3e9dc76d060c4d6d79370e0803fd
Author: Martin Tzvetanov Grigorov 
AuthorDate: Wed Jun 10 16:38:22 2020 +0300

Fix the version of the Eclipse compiler for the IDEA project template
---
 res/ide-support/idea/tomcat.iml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 94f0130..c7a9c03 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 


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

Re: Improving OSGi/bnd build and much more...

[Raymond Auge]

Thanks for the feedback. I'll look at each point carefully.

I can report though that tests are looking relatively good. Only a few
failures:

TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.APR.txt:Tests
run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.057 sec
TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt:Tests
run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.054 sec
TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt:Tests
run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.057 sec
TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.APR.txt:Tests
run: 86, Failures: 10, Errors: 0, Skipped: 1, Time elapsed: 0.283 sec
TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO2.txt:Tests
run: 86, Failures: 10, Errors: 0, Skipped: 1, Time elapsed: 0.287 sec
TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO.txt:Tests
run: 86, Failures: 10, Errors: 0, Skipped: 1, Time elapsed: 0.281 sec
TEST-org.apache.tomcat.util.res.TestStringManager.APR.txt:Tests run: 5,
Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec
TEST-org.apache.tomcat.util.res.TestStringManager.NIO2.txt:Tests run: 5,
Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec
TEST-org.apache.tomcat.util.res.TestStringManager.NIO.txt:Tests run: 5,
Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec

:)

On Tue, Jun 9, 2020 at 2:54 PM Mark Thomas  wrote:

> On 09/06/2020 18:37, Raymond Auge wrote:
> > Hey All (particularly Markt whom I spoke with about this months and
> > months ago),
> >
> > Noting that bnd was already added to the build I took a crack at making
> > better use of it.
> >
> > Here are a few items and some questions in no particular order:
> >
> > - you don't use bndlib, can we remove that? bnd is fully standalone for
> > your purposes and is all you need
>
> If we don't need it then +1 to dropping it.
>
> > - bootstrap.jar in master seems to be missing the class
> > `org.apache.tomcat.util.ExceptionUtils` at least from a dependency
> > analysis point of view, should it be included in the files list?
>
> No sure. That needs some more careful thought / analysis.
>
> > - tomcat-embed-core.jar appears to be missing tribes dependency (at
> > least it refers to it but does not include it) Shouldn't it really
> > contain all of catalina (minus catalina-ant?)
>
> That is deliberate.
>
> > - files.tomcat-embed-core seems to reference an old package
> > org/apache/jk/**, can we remove that?
>
> Yes, that can be removed.
>
> > - I've split out the i18n LocalStrings_* (the locale specific ones) into
> > a separate output dir so that you wouldn't have to then filter them out,
> > it makes building their zips also cleaner, does that sound logical?
>
> I'd want to see the patch for that first.
>
> > - I moved a slew of concerns that bnd could handle out of ant and
> > directly into the bnd configurations, manifest filtering, etc., bnd has
> > filtering capability built in and knows about all ant properties so this
> > eliminates ant work, comments on that?
>
> Again, I'd want to see the patch for that.
>
> > - generated all the Name sections for spec API packages instead of
> > maintaining those by hand (now they are complete)
>
> Sounds good.
>
> > - add all the correct OSGi metadata of course to the spec jars and to
> > everyone else.
>
> Sounds good. Note the naming convention may have changed in the move
> from Java EE to Jakarta EE.
>
> > - I've added bnd's JPMS build support to all the modules, still builds
> > on Java 8, and you get JPMS module-info almost for free (very small
> > amount of configurable bits)
>
> Generally sounds good. My only concern is consistency for the spec JARs.
>
> > Could someone provide the build instruction I'd need to do the most
> > throughout test build? I see that there's a .travis script which does
> > `ant -q test 2>&1 > ant-test.log` is that really all?
>
> Yes, assuming you have properties set to point to a valid Tomcat Native
> build.
>
> > Shall I create an SVN branch to explore this? Or would a git PR be
> enough?
>
> I'd recommend tacking this one issue at a time. PRs would be fine for
> that. Some should be pretty quick.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

[tomcat] branch 8.5.x updated: Downgrade Objenesis to 2.6

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov 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 9904507  Downgrade Objenesis to 2.6
9904507 is described below

commit 990450720bf668ad4f9699cbd40e005d449dc559
Author: Martin Tzvetanov Grigorov 
AuthorDate: Wed Jun 10 16:20:48 2020 +0300

Downgrade Objenesis to 2.6

This is the last release with Java 7 support
---
 build.properties.default| 4 ++--
 res/ide-support/eclipse/eclipse.classpath   | 2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 8539815..1f462f5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -244,10 +244,10 @@ cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
 
cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
 
 # - objenesis, used by EasyMock, version 1.2 or later -
-objenesis.version=3.1
+objenesis.version=2.6
 objenesis.checksum.enabled=true
 objenesis.checksum.algorithm=SHA-512
-objenesis.checksum.value=4dcfc065d6ccc1e0cb716fc86d844e81a347591d06f99b1840157c51c58a842bdebe86f6bcacee65996b64468d21bdf3bcf463a7f4ae5261440c8f0f6fac8ab3
+objenesis.checksum.value=23a593bded8cb43236faad2018b008da47bf4e29cc60c2e98fd4f2ed578fe2baddd3a98547dc14273017c82cb19ce8eaaab71d49273411856a2ba1a5d51015fc
 objenesis.home=${base.path}/objenesis-${objenesis.version}
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index d8eadf4..67e4601 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -28,6 +28,6 @@
 
 
 
-
+
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index e710dab..6f5058e 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.6/easymock-3.6.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.6/easymock-3.6.jar:${base.path}/objenesis-2.6/objenesis-2.6.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index e50967e..4e60b3c 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.6/easymock-3.6.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
+output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.6/easymock-3.6.jar:${base.path}/objenesis-2.6/objenesis-2.6.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
 1.7
 
 


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

Re: buildbot failure in on tomcat-85-trunk

[Martin Grigorov]

On Wed, Jun 10, 2020 at 3:08 PM Mark Thomas  wrote:

> On 10/06/2020 13:01, Martin Grigorov wrote:
> > Hi,
> >
> > The build of 8.5.x passes here but it failed
> > at https://ci.apache.org/builders/tomcat-85-trunk/builds/2349.
> > But without access to the file system I cannot find what is the reason.
> > How do you investigate such problems at Buildbot machines ?
>
> https://ci.apache.org/projects/tomcat/tomcat85/
>
> In logs there is a dir for each build with all the individual output files.
>

Thanks!


>
> Mark
>
>
> >
> > [concat] Testsuites with failed tests:
> >[concat] TEST-org.apache.catalina.realm.TestJNDIRealm.APR.txt
> >[concat] TEST-org.apache.catalina.realm.TestJNDIRealm.NIO.txt
> >[concat] TEST-org.apache.catalina.realm.TestJNDIRealm.NIO2.txt
> >[concat]
> TEST-org.apache.catalina.startup.TestWebappServiceLoader.APR.txt
> >[concat]
> TEST-org.apache.catalina.startup.TestWebappServiceLoader.NIO.txt
> >[concat]
> > TEST-org.apache.catalina.startup.TestWebappServiceLoader.NIO2.txt
> >[concat]
> > TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.APR.txt
> >[concat]
> > TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.NIO.txt
> >[concat]
> > TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.NIO2.txt
> >[concat]
> > TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.APR.txt
> >[concat]
> > TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.NIO.txt
> >[concat]
> > TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.NIO2.txt
> >[concat] TEST-org.apache.catalina.valves.TestSSLValve.APR.txt
> >[concat] TEST-org.apache.catalina.valves.TestSSLValve.NIO.txt
> >[concat] TEST-org.apache.catalina.valves.TestSSLValve.NIO2.txt
> >[concat] TEST-org.apache.jasper.servlet.TestTldScanner.APR.txt
> >[concat] TEST-org.apache.jasper.servlet.TestTldScanner.NIO.txt
> >[concat] TEST-org.apache.jasper.servlet.TestTldScanner.NIO2.txt
> >
> > BUILD FAILED
> > /home/buildslave/slave/tomcat-85-trunk/build/build.xml:1467: Some tests
> > completed with an Error. See
> > /home/buildslave/slave/tomcat-85-trunk/build/output/build/logs for
> > details, search for "ERROR".
> >
> > Total time: 15 minutes 27 seconds
> >
> >
> >
> > On Tue, Jun 9, 2020 at 11:31 PM  > > wrote:
> >
> > The Buildbot has detected a new failure on builder tomcat-85-trunk
> > while building tomcat. Full details are available at:
> > https://ci.apache.org/builders/tomcat-85-trunk/builds/2347
> >
> > Buildbot URL: https://ci.apache.org/
> >
> > Buildslave for this Build: asf946_ubuntu
> >
> > Build Reason: The AnyBranchScheduler scheduler named
> > 'on-tomcat-85-commit' triggered this build
> > Build Source Stamp: [branch 8.5.x]
> > 1cb2595861be406faf224417bb3dd874f9254bc0
> > Blamelist: Mark Thomas  > >,Martin Tzvetanov Grigorov
> > mailto:mgrigo...@apache.org>>
> >
> > BUILD FAILED: failed compile_1
> >
> > Sincerely,
> >  -The Buildbot
> >
> >
> >
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > 
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> > 
> >
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: buildbot failure in on tomcat-85-trunk

[Rémy Maucherat]

On Wed, Jun 10, 2020 at 2:02 PM Martin Grigorov 
wrote:

> Hi,
>
> The build of 8.5.x passes here but it failed at
> https://ci.apache.org/builders/tomcat-85-trunk/builds/2349.
> But without access to the file system I cannot find what is the reason.
> How do you investigate such problems at Buildbot machines ?
>
> [concat] Testsuites with failed tests:
>[concat] TEST-org.apache.catalina.realm.TestJNDIRealm.APR.txt
>[concat] TEST-org.apache.catalina.realm.TestJNDIRealm.NIO.txt
>[concat] TEST-org.apache.catalina.realm.TestJNDIRealm.NIO2.txt
>[concat]
> TEST-org.apache.catalina.startup.TestWebappServiceLoader.APR.txt
>[concat]
> TEST-org.apache.catalina.startup.TestWebappServiceLoader.NIO.txt
>[concat]
> TEST-org.apache.catalina.startup.TestWebappServiceLoader.NIO2.txt
>[concat]
> TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.APR.txt
>[concat]
> TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.NIO.txt
>[concat]
> TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.NIO2.txt
>[concat]
> TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.APR.txt
>[concat]
> TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.NIO.txt
>[concat]
> TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.NIO2.txt
>[concat] TEST-org.apache.catalina.valves.TestSSLValve.APR.txt
>[concat] TEST-org.apache.catalina.valves.TestSSLValve.NIO.txt
>[concat] TEST-org.apache.catalina.valves.TestSSLValve.NIO2.txt
>[concat] TEST-org.apache.jasper.servlet.TestTldScanner.APR.txt
>[concat] TEST-org.apache.jasper.servlet.TestTldScanner.NIO.txt
>[concat] TEST-org.apache.jasper.servlet.TestTldScanner.NIO2.txt
>
> BUILD FAILED
> /home/buildslave/slave/tomcat-85-trunk/build/build.xml:1467: Some tests
> completed with an Error. See
> /home/buildslave/slave/tomcat-85-trunk/build/output/build/logs for details,
> search for "ERROR".
>
> Total time: 15 minutes 27 seconds
>

Objenesis seems to be compiled for Java 8. Supporting Java 7 becomes harder
...

Rémy

>
>
>
> On Tue, Jun 9, 2020 at 11:31 PM  wrote:
>
>> The Buildbot has detected a new failure on builder tomcat-85-trunk while
>> building tomcat. Full details are available at:
>> https://ci.apache.org/builders/tomcat-85-trunk/builds/2347
>>
>> Buildbot URL: https://ci.apache.org/
>>
>> Buildslave for this Build: asf946_ubuntu
>>
>> Build Reason: The AnyBranchScheduler scheduler named
>> 'on-tomcat-85-commit' triggered this build
>> Build Source Stamp: [branch 8.5.x]
>> 1cb2595861be406faf224417bb3dd874f9254bc0
>> Blamelist: Mark Thomas ,Martin Tzvetanov Grigorov <
>> mgrigo...@apache.org>
>>
>> BUILD FAILED: failed compile_1
>>
>> Sincerely,
>>  -The Buildbot
>>
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>

Re: buildbot failure in on tomcat-85-trunk

[Mark Thomas]

On 10/06/2020 13:01, Martin Grigorov wrote:
> Hi,
> 
> The build of 8.5.x passes here but it failed
> at https://ci.apache.org/builders/tomcat-85-trunk/builds/2349. 
> But without access to the file system I cannot find what is the reason.
> How do you investigate such problems at Buildbot machines ?

https://ci.apache.org/projects/tomcat/tomcat85/

In logs there is a dir for each build with all the individual output files.

Mark


> 
> [concat] Testsuites with failed tests:
>    [concat] TEST-org.apache.catalina.realm.TestJNDIRealm.APR.txt
>    [concat] TEST-org.apache.catalina.realm.TestJNDIRealm.NIO.txt
>    [concat] TEST-org.apache.catalina.realm.TestJNDIRealm.NIO2.txt
>    [concat] TEST-org.apache.catalina.startup.TestWebappServiceLoader.APR.txt
>    [concat] TEST-org.apache.catalina.startup.TestWebappServiceLoader.NIO.txt
>    [concat]
> TEST-org.apache.catalina.startup.TestWebappServiceLoader.NIO2.txt
>    [concat]
> TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.APR.txt
>    [concat]
> TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.NIO.txt
>    [concat]
> TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.NIO2.txt
>    [concat]
> TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.APR.txt
>    [concat]
> TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.NIO.txt
>    [concat]
> TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.NIO2.txt
>    [concat] TEST-org.apache.catalina.valves.TestSSLValve.APR.txt
>    [concat] TEST-org.apache.catalina.valves.TestSSLValve.NIO.txt
>    [concat] TEST-org.apache.catalina.valves.TestSSLValve.NIO2.txt
>    [concat] TEST-org.apache.jasper.servlet.TestTldScanner.APR.txt
>    [concat] TEST-org.apache.jasper.servlet.TestTldScanner.NIO.txt
>    [concat] TEST-org.apache.jasper.servlet.TestTldScanner.NIO2.txt
> 
> BUILD FAILED
> /home/buildslave/slave/tomcat-85-trunk/build/build.xml:1467: Some tests
> completed with an Error. See
> /home/buildslave/slave/tomcat-85-trunk/build/output/build/logs for
> details, search for "ERROR".
> 
> Total time: 15 minutes 27 seconds
> 
> 
> 
> On Tue, Jun 9, 2020 at 11:31 PM  > wrote:
> 
> The Buildbot has detected a new failure on builder tomcat-85-trunk
> while building tomcat. Full details are available at:
>     https://ci.apache.org/builders/tomcat-85-trunk/builds/2347
> 
> Buildbot URL: https://ci.apache.org/
> 
> Buildslave for this Build: asf946_ubuntu
> 
> Build Reason: The AnyBranchScheduler scheduler named
> 'on-tomcat-85-commit' triggered this build
> Build Source Stamp: [branch 8.5.x]
> 1cb2595861be406faf224417bb3dd874f9254bc0
> Blamelist: Mark Thomas  >,Martin Tzvetanov Grigorov
> mailto:mgrigo...@apache.org>>
> 
> BUILD FAILED: failed compile_1
> 
> Sincerely,
>  -The Buildbot
> 
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> 
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 


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

Re: buildbot failure in on tomcat-85-trunk

[Martin Grigorov]

Hi,

The build of 8.5.x passes here but it failed at
https://ci.apache.org/builders/tomcat-85-trunk/builds/2349.
But without access to the file system I cannot find what is the reason.
How do you investigate such problems at Buildbot machines ?

[concat] Testsuites with failed tests:
   [concat] TEST-org.apache.catalina.realm.TestJNDIRealm.APR.txt
   [concat] TEST-org.apache.catalina.realm.TestJNDIRealm.NIO.txt
   [concat] TEST-org.apache.catalina.realm.TestJNDIRealm.NIO2.txt
   [concat] TEST-org.apache.catalina.startup.TestWebappServiceLoader.APR.txt
   [concat] TEST-org.apache.catalina.startup.TestWebappServiceLoader.NIO.txt
   [concat]
TEST-org.apache.catalina.startup.TestWebappServiceLoader.NIO2.txt
   [concat]
TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.APR.txt
   [concat]
TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.NIO.txt
   [concat]
TEST-org.apache.catalina.valves.TestCrawlerSessionManagerValve.NIO2.txt
   [concat]
TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.APR.txt
   [concat]
TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.NIO.txt
   [concat]
TEST-org.apache.catalina.valves.TestLoadBalancerDrainingValve.NIO2.txt
   [concat] TEST-org.apache.catalina.valves.TestSSLValve.APR.txt
   [concat] TEST-org.apache.catalina.valves.TestSSLValve.NIO.txt
   [concat] TEST-org.apache.catalina.valves.TestSSLValve.NIO2.txt
   [concat] TEST-org.apache.jasper.servlet.TestTldScanner.APR.txt
   [concat] TEST-org.apache.jasper.servlet.TestTldScanner.NIO.txt
   [concat] TEST-org.apache.jasper.servlet.TestTldScanner.NIO2.txt

BUILD FAILED
/home/buildslave/slave/tomcat-85-trunk/build/build.xml:1467: Some tests
completed with an Error. See
/home/buildslave/slave/tomcat-85-trunk/build/output/build/logs for details,
search for "ERROR".

Total time: 15 minutes 27 seconds



On Tue, Jun 9, 2020 at 11:31 PM  wrote:

> The Buildbot has detected a new failure on builder tomcat-85-trunk while
> building tomcat. Full details are available at:
> https://ci.apache.org/builders/tomcat-85-trunk/builds/2347
>
> Buildbot URL: https://ci.apache.org/
>
> Buildslave for this Build: asf946_ubuntu
>
> Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit'
> triggered this build
> Build Source Stamp: [branch 8.5.x] 1cb2595861be406faf224417bb3dd874f9254bc0
> Blamelist: Mark Thomas ,Martin Tzvetanov Grigorov <
> mgrigo...@apache.org>
>
> BUILD FAILED: failed compile_1
>
> Sincerely,
>  -The 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: Use Easymock 3.6

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov 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 07e6cf4  Use Easymock 3.6
07e6cf4 is described below

commit 07e6cf4f1ac64370679fdccc08a9185f4dde7f09
Author: Martin Tzvetanov Grigorov 
AuthorDate: Wed Jun 10 12:55:29 2020 +0300

Use Easymock 3.6
---
 build.properties.default | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 331556c..8539815 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -226,10 +226,10 @@ 
hamcrest.jar=${hamcrest.home}/hamcrest-${hamcrest.version}.jar
 
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar
 
 # - EasyMock, version 3.2 or later -
-easymock.version=4.2
+easymock.version=3.6
 easymock.checksum.enabled=true
 easymock.checksum.algorithm=SHA-512
-easymock.checksum.value=6fbc3080c9f12aa8dcd1db8aa74e1621caa1d437c0fa64c70a3fe0d46ff74ac2d8d87ac544550487b7aaae98844d4d9d114c724bfc6d9a8873136353f87d8f2e
+easymock.checksum.value=b49673e7872aa8b006d377a4ca56eed8f6e98e45ea4efe26d24cafe81ea569b557f5a326edcd387288267db8c4b59f2c3c61010f3ad01c4d1067a35430533794
 easymock.home=${base.path}/easymock-${easymock.version}
 easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
 
easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymock-${easymock.version}.jar
@@ -290,4 +290,4 @@ saaj-api.checksum.algorithm=MD5|SHA-1
 
saaj-api.checksum.value=caae8b4bf2c551155815331e9e96256f|1c399a7fea4d0262a6a39750e419c24f0c769586
 saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
 saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
-saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
\ No newline at end of file
+saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar


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

[Bug 64503] ClassNotFoundException: org.apache.naming.java.javaURLContextFactory using java.util.Collection.parallelStream()

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64503

--- Comment #4 from Michael Seele  ---
Thanks for the answer, Mark.

Just for the record, here is how I solved it:

I created a new helper method that acts like a wrapper for the mapping
function:

public static  Function parallel(Function function) {
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
return input -> {
Thread thread = Thread.currentThread();
ClassLoader originalTccl = thread.getContextClassLoader();
try {
thread.setContextClassLoader(tccl);
return function.apply(input);
} finally {
thread.setContextClassLoader(originalTccl);
}
};
}

The method is used this way and solves the problem:

List values = keys.parallelStream().map(parallel(key -> {
try {
return (String) InitialContext.doLookup(DEFAULT_CONTEXT + key);
} catch (NamingException e) {
throw new RuntimeException("Error on lookup", e); //$NON-NLS-1$
}
})).collect(Collectors.toList());

-- 
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