[Bug 69195] custom 400 error redirect not working in tomcat 9

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69195

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEEDINFO|RESOLVED

--- Comment #5 from Remy Maucherat  ---
Please use the users mailing list to get advice on this.
Basically, the URL is invalid so it will not get mapped. As a result you cannot
use the webapp error page mechanism (you could configure the error valve
instead).

-- 
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 69180] Windows Tomcat service crashes in certain cases

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69180

--- Comment #12 from Mark Thomas  ---
Thanks for creating the DAEMON issue and for all the debugging you have done.

I'll leave this issue open to track updating Tomcat to a fixed version of
DAEMON.

-- 
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: [I] test [tomcat-jakartaee-migration]

2024-07-16 Thread via GitHub


aooohan closed issue #59: test
URL: https://github.com/apache/tomcat-jakartaee-migration/issues/59


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

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

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


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



(tomcat) branch main updated: Fix regression calling add-osgi

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new a4d3724c25 Fix regression calling add-osgi
a4d3724c25 is described below

commit a4d3724c25a79ea7f0ebb4ccfb055d576da54789
Author: remm 
AuthorDate: Tue Jul 16 11:40:19 2024 +0200

Fix regression calling add-osgi

Unless means not set at all, evaluating to false is not the same.
---
 build.xml  | 1 -
 webapps/docs/changelog.xml | 8 
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index a593c019b1..64d09ca245 100644
--- a/build.xml
+++ b/build.xml
@@ -110,7 +110,6 @@
   
   
   
-  
 
   
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 68a9c6b794..944d0bfaf3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,6 +125,14 @@
   
 
   
+  
+
+  
+Fix packaging regression with missing osgi information following
+addition of the test-only build target. (remm)
+  
+
+  
 
 
   


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



(tomcat) branch 10.1.x updated: Fix regression calling add-osgi

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 3eebf76d67 Fix regression calling add-osgi
3eebf76d67 is described below

commit 3eebf76d67b48dc3b966521c52bbd8a7d1559af3
Author: remm 
AuthorDate: Tue Jul 16 11:40:19 2024 +0200

Fix regression calling add-osgi

Unless means not set at all, evaluating to false is not the same.
---
 build.xml  | 1 -
 webapps/docs/changelog.xml | 8 
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 43a82d856a..c1ed116515 100644
--- a/build.xml
+++ b/build.xml
@@ -110,7 +110,6 @@
   
   
   
-  
 
   
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a73a11c0c3..a4366c857e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Fix packaging regression with missing osgi information following
+addition of the test-only build target. (remm)
+  
+
+  
 
 
   


-
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 regression calling add-osgi

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new f25d133385 Fix regression calling add-osgi
f25d133385 is described below

commit f25d133385dadaef3540de8140c78d1eca12ac83
Author: remm 
AuthorDate: Tue Jul 16 11:40:19 2024 +0200

Fix regression calling add-osgi

Unless means not set at all, evaluating to false is not the same.
---
 build.xml  | 1 -
 webapps/docs/changelog.xml | 8 
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 53e811908c..2ceb02abb1 100644
--- a/build.xml
+++ b/build.xml
@@ -109,7 +109,6 @@
   
   
   
-  
 
   
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 622bf0af0f..cfae001c34 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,14 @@
   
 
   
+  
+
+  
+Fix packaging regression with missing osgi information following
+addition of the test-only build target. (remm)
+  
+
+  
 
 
   


-
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 manifests with bnd

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 2c6d23e2fc Fix manifests with bnd
2c6d23e2fc is described below

commit 2c6d23e2fc3d25fd271b2d83f8adaa30e3308d4b
Author: remm 
AuthorDate: Tue Jul 16 11:59:21 2024 +0200

Fix manifests with bnd
---
 res/bnd/annotations-api.jar.tmp.bnd| 2 ++
 res/bnd/build-defaults.bnd | 3 ---
 res/bnd/catalina-ha.jar.tmp.bnd| 2 ++
 res/bnd/catalina-ssi.jar.tmp.bnd   | 2 ++
 res/bnd/catalina-storeconfig.jar.tmp.bnd   | 2 ++
 res/bnd/catalina-tribes.jar.tmp.bnd| 2 ++
 res/bnd/catalina.jar.tmp.bnd   | 2 ++
 res/bnd/el-api.jar.tmp.bnd | 2 ++
 res/bnd/jasper-el.jar.tmp.bnd  | 2 ++
 res/bnd/jasper.jar.tmp.bnd | 2 ++
 res/bnd/jaspic-api.jar.tmp.bnd | 2 ++
 res/bnd/jsp-api.jar.tmp.bnd| 2 ++
 res/bnd/servlet-api.jar.tmp.bnd| 2 ++
 res/bnd/tomcat-api.jar.tmp.bnd | 2 ++
 res/bnd/tomcat-coyote.jar.tmp.bnd  | 2 ++
 res/bnd/tomcat-dbcp.jar.tmp.bnd| 2 ++
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 2 ++
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 2 ++
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 2 ++
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 ++
 res/bnd/tomcat-jni.jar.tmp.bnd | 2 ++
 res/bnd/tomcat-juli.jar.tmp.bnd| 2 ++
 res/bnd/tomcat-util-scan.jar.tmp.bnd   | 2 ++
 res/bnd/tomcat-util.jar.tmp.bnd| 2 ++
 res/bnd/tomcat-websocket.jar.tmp.bnd   | 2 ++
 res/bnd/websocket-api.jar.tmp.bnd  | 2 ++
 26 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/res/bnd/annotations-api.jar.tmp.bnd 
b/res/bnd/annotations-api.jar.tmp.bnd
index f21889dbb6..b3e1b88f06 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -19,6 +19,8 @@ Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
 Export-Package: \
 javax.annotation.*;version=1.3
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
 
 Provide-Capability: \
 osgi.contract;\
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index b804587bc0..37532ca3c7 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -23,9 +23,6 @@ Implementation-Title: Apache Tomcat
 Implementation-Version: ${version}
 Implementation-Vendor: Apache Software Foundation
 
-X-Compile-Source-JDK: ${compile.release}
-X-Compile-Target-JDK: ${compile.release}
-
 -includeresource.notice: 
META-INF/NOTICE=${tomcat.output}/manifests/default.notice
 -includeresource.license: 
META-INF/LICENSE=${tomcat.output}/manifests/default.license
 
diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
index 278e6a813b..d506d92b55 100644
--- a/res/bnd/catalina-ha.jar.tmp.bnd
+++ b/res/bnd/catalina-ha.jar.tmp.bnd
@@ -25,6 +25,8 @@ Export-Package: \
 org.apache.catalina.ha.deploy,\
 org.apache.catalina.ha.session,\
 org.apache.catalina.ha.tcp
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
index a8b0c3b6d5..99fe6aa292 100644
--- a/res/bnd/catalina-ssi.jar.tmp.bnd
+++ b/res/bnd/catalina-ssi.jar.tmp.bnd
@@ -19,6 +19,8 @@ Bundle-Name: tomcat-ssi
 Bundle-SymbolicName: org.apache.tomcat-ssi
 Export-Package: \
 org.apache.catalina.ssi
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/catalina-storeconfig.jar.tmp.bnd 
b/res/bnd/catalina-storeconfig.jar.tmp.bnd
index c47666a43e..cffdc6320e 100644
--- a/res/bnd/catalina-storeconfig.jar.tmp.bnd
+++ b/res/bnd/catalina-storeconfig.jar.tmp.bnd
@@ -18,6 +18,8 @@
 Bundle-Name: tomcat-storeconfig
 Bundle-SymbolicName: org.apache.tomcat-storeconfig
 Export-Package: org.apache.catalina.storeconfig
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd 
b/res/bnd/catalina-tribes.jar.tmp.bnd
index 09c7f54394..fac5f438d1 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -29,6 +29,8 @@ Export-Package: \
 org.apache.catalina.tribes.transport.bio,\
 org.apache.catalina.tribes.transport.nio,\
 org.apache.catalina.tribes.util
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
 
 -includepackage: \
 org.apache.catalina.tribes.membership.cloud
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 8f2d0111cf..8c28118293 100644
--- a/res/bnd/cata

Buildbot success in on tomcat-11.0.x

2024-07-16 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1184
Blamelist: remm 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch main] a4d3724c25a79ea7f0ebb4ccfb055d576da54789


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 0

  shell_10: 0

  Rsync docs to nightlies.apache.org: 0

  shell_11: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_12: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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



Re: (tomcat) branch main updated: Fix regression calling add-osgi

2024-07-16 Thread Mark Thomas

On 16/07/2024 10:40, r...@apache.org wrote:

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

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


The following commit(s) were added to refs/heads/main by this push:
  new a4d3724c25 Fix regression calling add-osgi
a4d3724c25 is described below

commit a4d3724c25a79ea7f0ebb4ccfb055d576da54789
Author: remm 
AuthorDate: Tue Jul 16 11:40:19 2024 +0200

 Fix regression calling add-osgi


(and setup-bnd - the module-info.class was also missing)

 
 Unless means not set at all, evaluating to false is not the same.


We could use:

unless="${skip.build.java.version}"

which does check for skip.build.java.version being set to true.

Changing add-osgi and setup-bnd to use that form should give consistent 
behaviour whether the property is set or not.


If there are no objections, I'll make that change.

Mark

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



Buildbot success in on tomcat-10.1.x

2024-07-16 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/1326
Blamelist: Christopher Schultz , remm 

Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 10.1.x] 3eebf76d67b48dc3b966521c52bbd8a7d1559af3


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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



Re: (tomcat) branch main updated: Fix regression calling add-osgi

2024-07-16 Thread Rémy Maucherat
On Tue, Jul 16, 2024 at 12:39 PM Mark Thomas  wrote:
>
> On 16/07/2024 10:40, r...@apache.org wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > remm pushed a commit to branch main
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> >
> > The following commit(s) were added to refs/heads/main by this push:
> >   new a4d3724c25 Fix regression calling add-osgi
> > a4d3724c25 is described below
> >
> > commit a4d3724c25a79ea7f0ebb4ccfb055d576da54789
> > Author: remm 
> > AuthorDate: Tue Jul 16 11:40:19 2024 +0200
> >
> >  Fix regression calling add-osgi
>
> (and setup-bnd - the module-info.class was also missing)
>
> >
> >  Unless means not set at all, evaluating to false is not the same.
>
> We could use:
>
> unless="${skip.build.java.version}"
>
> which does check for skip.build.java.version being set to true.
>
> Changing add-osgi and setup-bnd to use that form should give consistent
> behaviour whether the property is set or not.
>
> If there are no objections, I'll make that change.

It would certainly be less error prone ...

Rémy

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



[Bug 69195] custom 400 error redirect not working in tomcat 9

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69195

--- Comment #6 from Ganeshkumar  ---
"you could configure the error valve instead"
i tried add the error valve and custom error valve in sever but its not working
out in tomcat

-- 
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 main updated: Add test case for jar modifications during build

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 5de9316aa2 Add test case for jar modifications during build
5de9316aa2 is described below

commit 5de9316aa2980d234c3278eee69255655540e6c9
Author: remm 
AuthorDate: Tue Jul 16 14:28:11 2024 +0200

Add test case for jar modifications during build

They do not visibly impact regular functionality otherwise so they need
a specific test.
---
 test/org/apache/catalina/startup/TestTomcatNoServer.java | 12 
 1 file changed, 12 insertions(+)

diff --git a/test/org/apache/catalina/startup/TestTomcatNoServer.java 
b/test/org/apache/catalina/startup/TestTomcatNoServer.java
index 882bd4a5a3..34f26c98dc 100644
--- a/test/org/apache/catalina/startup/TestTomcatNoServer.java
+++ b/test/org/apache/catalina/startup/TestTomcatNoServer.java
@@ -21,6 +21,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -86,4 +88,14 @@ public class TestTomcatNoServer {
 Assert.fail("Embedded is missing [" + missingInWebXml.size() + "] 
entries compared to conf/web.xml");
 }
 }
+
+@Test
+public void testJarsDecoration() throws Exception {
+File libDir = new File(LoggingBaseTest.getBuildDirectory(), "lib");
+try (JarFile catalinaJar = new JarFile(new File(libDir, 
"tomcat-util.jar"))) {
+Manifest manifest = catalinaJar.getManifest();
+
Assert.assertFalse(manifest.getMainAttributes().getValue("Export-Package").isEmpty());
+Assert.assertNotNull(catalinaJar.getJarEntry("module-info.class"));
+}
+}
 }


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



(tomcat) branch 10.1.x updated: Add test case for jar modifications during build

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 2da7daeed5 Add test case for jar modifications during build
2da7daeed5 is described below

commit 2da7daeed56068cc96e6f0c503ba27b627c80373
Author: remm 
AuthorDate: Tue Jul 16 14:28:11 2024 +0200

Add test case for jar modifications during build

They do not visibly impact regular functionality otherwise so they need
a specific test.
---
 test/org/apache/catalina/startup/TestTomcatNoServer.java | 12 
 1 file changed, 12 insertions(+)

diff --git a/test/org/apache/catalina/startup/TestTomcatNoServer.java 
b/test/org/apache/catalina/startup/TestTomcatNoServer.java
index 882bd4a5a3..34f26c98dc 100644
--- a/test/org/apache/catalina/startup/TestTomcatNoServer.java
+++ b/test/org/apache/catalina/startup/TestTomcatNoServer.java
@@ -21,6 +21,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -86,4 +88,14 @@ public class TestTomcatNoServer {
 Assert.fail("Embedded is missing [" + missingInWebXml.size() + "] 
entries compared to conf/web.xml");
 }
 }
+
+@Test
+public void testJarsDecoration() throws Exception {
+File libDir = new File(LoggingBaseTest.getBuildDirectory(), "lib");
+try (JarFile catalinaJar = new JarFile(new File(libDir, 
"tomcat-util.jar"))) {
+Manifest manifest = catalinaJar.getManifest();
+
Assert.assertFalse(manifest.getMainAttributes().getValue("Export-Package").isEmpty());
+Assert.assertNotNull(catalinaJar.getJarEntry("module-info.class"));
+}
+}
 }


-
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: Add test case for jar modifications during build

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 623145f563 Add test case for jar modifications during build
623145f563 is described below

commit 623145f563fd3c72ce8966be8221e25676b5c4a3
Author: remm 
AuthorDate: Tue Jul 16 14:28:11 2024 +0200

Add test case for jar modifications during build

They do not visibly impact regular functionality otherwise so they need
a specific test.
---
 test/org/apache/catalina/startup/TestTomcatNoServer.java | 12 
 1 file changed, 12 insertions(+)

diff --git a/test/org/apache/catalina/startup/TestTomcatNoServer.java 
b/test/org/apache/catalina/startup/TestTomcatNoServer.java
index 882bd4a5a3..34f26c98dc 100644
--- a/test/org/apache/catalina/startup/TestTomcatNoServer.java
+++ b/test/org/apache/catalina/startup/TestTomcatNoServer.java
@@ -21,6 +21,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -86,4 +88,14 @@ public class TestTomcatNoServer {
 Assert.fail("Embedded is missing [" + missingInWebXml.size() + "] 
entries compared to conf/web.xml");
 }
 }
+
+@Test
+public void testJarsDecoration() throws Exception {
+File libDir = new File(LoggingBaseTest.getBuildDirectory(), "lib");
+try (JarFile catalinaJar = new JarFile(new File(libDir, 
"tomcat-util.jar"))) {
+Manifest manifest = catalinaJar.getManifest();
+
Assert.assertFalse(manifest.getMainAttributes().getValue("Export-Package").isEmpty());
+Assert.assertNotNull(catalinaJar.getJarEntry("module-info.class"));
+}
+}
 }


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



[Bug 69180] Windows Tomcat service crashes in certain cases

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69180

--- Comment #13 from qoo...@gmail.com ---
(In reply to Mark Thomas from comment #12)
> Thanks for creating the DAEMON issue and for all the debugging you have done.
> 
> I'll leave this issue open to track updating Tomcat to a fixed version of
> DAEMON.

Thank 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



(tomcat) branch main updated: Bump version numbers

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 7af5a1c0d7 Bump version numbers
7af5a1c0d7 is described below

commit 7af5a1c0d7e173f4cff4fb695df3bc8f222b3b00
Author: remm 
AuthorDate: Tue Jul 16 18:04:59 2024 +0200

Bump version numbers
---
 modules/stuffed/Dockerfile | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/stuffed/Dockerfile b/modules/stuffed/Dockerfile
index 14eabd10dd..b5a8a72a95 100644
--- a/modules/stuffed/Dockerfile
+++ b/modules/stuffed/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM eclipse-temurin:21-jre
+FROM eclipse-temurin:22-jre
 VOLUME /tmp
 
 USER root
@@ -38,8 +38,8 @@ ENV JAVA_OPTS="-Dcatalina.base=. 
-Djava.security.egd=file:/dev/urandom"
 
 # Add JULI logging configuration
 ENV JAVA_OPTS="${JAVA_OPTS} 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager 
-Djava.util.logging.config.file=conf/logging.properties"
-# OpenSSL integration for Java 17
-#ENV JAVA_OPTS="${JAVA_OPTS} --enable-native-access=ALL-UNNAMED --add-modules 
jdk.incubator.foreign"
+# OpenSSL FFM
+ENV JAVA_OPTS="${JAVA_OPTS} --enable-native-access=ALL-UNNAMED"
 
 RUN sh -c 'touch app.jar'
 
@@ -52,7 +52,7 @@ RUN mkdir -p /opt
 # EXPOSE $jolokiaport
 
 # Optional: Add Prometheus agent for JMX monitoring
-# RUN mkdir /opt/prometheus && wget 
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.20.0/jmx_prometheus_javaagent-0.20.0.jar
 -O /opt/prometheus/prometheus.jar && wget 
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
 -O conf/prometheus.yaml
+# RUN mkdir /opt/prometheus && wget 
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/1.0.1/jmx_prometheus_javaagent-1.0.1.jar
 -O /opt/prometheus/prometheus.jar && wget 
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
 -O conf/prometheus.yaml
 # ARG prometheusport=9404
 # ENV 
JAVA_OPTS="-javaagent:/opt/prometheus/prometheus.jar=$prometheusport:conf/prometheus.yaml
 ${JAVA_OPTS}"
 # EXPOSE $prometheusport


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



(tomcat) branch 10.1.x updated: Bump version numbers

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new f5fd7eeed9 Bump version numbers
f5fd7eeed9 is described below

commit f5fd7eeed929d6baed7c7a1efe19ec4884a61a82
Author: remm 
AuthorDate: Tue Jul 16 18:04:59 2024 +0200

Bump version numbers
---
 modules/stuffed/Dockerfile | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/stuffed/Dockerfile b/modules/stuffed/Dockerfile
index 0ab94d3156..b5a8a72a95 100644
--- a/modules/stuffed/Dockerfile
+++ b/modules/stuffed/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM eclipse-temurin:11-jre
+FROM eclipse-temurin:22-jre
 VOLUME /tmp
 
 USER root
@@ -38,8 +38,8 @@ ENV JAVA_OPTS="-Dcatalina.base=. 
-Djava.security.egd=file:/dev/urandom"
 
 # Add JULI logging configuration
 ENV JAVA_OPTS="${JAVA_OPTS} 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager 
-Djava.util.logging.config.file=conf/logging.properties"
-# OpenSSL integration for Java 17
-#ENV JAVA_OPTS="${JAVA_OPTS} --enable-native-access=ALL-UNNAMED --add-modules 
jdk.incubator.foreign"
+# OpenSSL FFM
+ENV JAVA_OPTS="${JAVA_OPTS} --enable-native-access=ALL-UNNAMED"
 
 RUN sh -c 'touch app.jar'
 
@@ -52,7 +52,7 @@ RUN mkdir -p /opt
 # EXPOSE $jolokiaport
 
 # Optional: Add Prometheus agent for JMX monitoring
-# RUN mkdir /opt/prometheus && wget 
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.20.0/jmx_prometheus_javaagent-0.20.0.jar
 -O /opt/prometheus/prometheus.jar && wget 
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
 -O conf/prometheus.yaml
+# RUN mkdir /opt/prometheus && wget 
https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/1.0.1/jmx_prometheus_javaagent-1.0.1.jar
 -O /opt/prometheus/prometheus.jar && wget 
https://raw.githubusercontent.com/prometheus/jmx_exporter/master/example_configs/tomcat.yml
 -O conf/prometheus.yaml
 # ARG prometheusport=9404
 # ENV 
JAVA_OPTS="-javaagent:/opt/prometheus/prometheus.jar=$prometheusport:conf/prometheus.yaml
 ${JAVA_OPTS}"
 # EXPOSE $prometheusport


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



(tomcat) branch 10.1.x updated: Bump version numbers

2024-07-16 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new b8cde1b944 Bump version numbers
b8cde1b944 is described below

commit b8cde1b9441911ed5b137babcdd77ed0ec2f3ff5
Author: remm 
AuthorDate: Tue Jul 16 18:07:58 2024 +0200

Bump version numbers
---
 modules/owb/pom.xml | 2 +-
 modules/stuffed/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index d08a6b640b..27b996b7dc 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -37,7 +37,7 @@
 2.1.0
 4.0.1
 2.1.1
-10.1.19
+10.1.26
 
 
 
diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index 66d99c3a71..e759324e93 100644
--- a/modules/stuffed/pom.xml
+++ b/modules/stuffed/pom.xml
@@ -29,7 +29,7 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-10.1.18
+10.1.26
 
 
 


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



[Bug 69180] Windows Tomcat service crashes in certain cases

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69180

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEEDINFO|RESOLVED

--- Comment #14 from Mark Thomas  ---
Testing shows that this appears to be an issue specific to the IBM JRE.

-- 
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: Ensure expected behaviour if skip.build.java.version is defined as false

2024-07-16 Thread 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 3fc2bbf1a3 Ensure expected behaviour if skip.build.java.version is 
defined as false
3fc2bbf1a3 is described below

commit 3fc2bbf1a3c11036cf72b49fb34229b3630c99ed
Author: Mark Thomas 
AuthorDate: Tue Jul 16 17:59:48 2024 +0100

Ensure expected behaviour if skip.build.java.version is defined as false
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 2ceb02abb1..d2a982c7aa 100644
--- a/build.xml
+++ b/build.xml
@@ -4021,7 +4021,7 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
-  
+  
 
 
   
@@ -4096,7 +4096,7 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
-  
+  
 
 
 


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



(tomcat) branch 10.1.x updated: Ensure expected behaviour if skip.build.java.version is defined as false

2024-07-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new c73dc190a1 Ensure expected behaviour if skip.build.java.version is 
defined as false
c73dc190a1 is described below

commit c73dc190a1736070242649ac5c0c0c70c6c2d691
Author: Mark Thomas 
AuthorDate: Tue Jul 16 17:59:48 2024 +0100

Ensure expected behaviour if skip.build.java.version is defined as false
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index c1ed116515..0519374340 100644
--- a/build.xml
+++ b/build.xml
@@ -4041,7 +4041,7 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
-  
+  
 
 
   
@@ -4116,7 +4116,7 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
-  
+  
 
 
 


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



(tomcat) branch main updated: Ensure expected behaviour if skip.build.java.version is defined as false

2024-07-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new ac5ee53e3d Ensure expected behaviour if skip.build.java.version is 
defined as false
ac5ee53e3d is described below

commit ac5ee53e3d3656f2a4cb2a8119b7e39e1f745db4
Author: Mark Thomas 
AuthorDate: Tue Jul 16 17:59:48 2024 +0100

Ensure expected behaviour if skip.build.java.version is defined as false
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 64d09ca245..70280c8e89 100644
--- a/build.xml
+++ b/build.xml
@@ -3959,7 +3959,7 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
-  
+  
 
 
   
@@ -4034,7 +4034,7 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
-  
+  
 
 
 


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



[Bug 69200] New: Fethiye Tour

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69200

Bug ID: 69200
   Summary: Fethiye Tour
   Product: Tomcat 11
   Version: unspecified
  Hardware: PC
OS: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: turkpasscen...@hotmail.com
  Target Milestone: ---

https://www.fethiyetours.com/wp-admin/

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



Buildbot failure in on tomcat-10.1.x

2024-07-16 Thread buildbot
Build status: BUILD FAILED: failed Snapshot deployed to ASF Maven snapshot 
repository (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/1328
Blamelist: Mark Thomas , remm 
Build Text: failed Snapshot deployed to ASF Maven snapshot repository (failure)
Status Detected: new failure
Build Source Stamp: [branch 10.1.x] c73dc190a1736070242649ac5c0c0c70c6c2d691


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 2


-- ASF Buildbot


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



[Bug 69200] Fethiye Tour

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69200

turkpasscen...@hotmail.com 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 69201] New: fethiye activities

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69201

Bug ID: 69201
   Summary: fethiye activities
   Product: Taglibs
   Version: EA1
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: BSF Taglib
  Assignee: dev@tomcat.apache.org
  Reporter: turkpasscen...@hotmail.com
  Target Milestone: ---

http://fethiyetours.com/

-- 
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 69202] Android Game Modifier Software

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69202

Game_Modifier  changed:

   What|Removed |Added

 OS||All
URL||https://luluboxpro-apk.com/

--- Comment #1 from Game_Modifier  ---
https://luluboxpro-apk.com/

-- 
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 69202] SPAM SPAM SPAM SPAM

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69202

Chuck Caldarale  changed:

   What|Removed |Added

Summary|Android Game Modifier   |SPAM SPAM SPAM SPAM
   |Software|
 Resolution|--- |INVALID
 Status|NEW |RESOLVED

-- 
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 69202] SPAM SPAM SPAM SPAM

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69202

Chuck Caldarale  changed:

   What|Removed |Added

  Attachment #39816|luluboxpro-apk.com  |SPAM SPAM SPAM SPAM
description||

-- 
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 69202] SPAM SPAM SPAM SPAM

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69202

Chuck Caldarale  changed:

   What|Removed |Added

URL|https://luluboxpro-apk.com/ |

-- 
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 69201] SPAM SPAM SPAM SPAM

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69201

Chuck Caldarale  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 OS||All
Summary|fethiye activities  |SPAM SPAM SPAM SPAM
 Status|NEW |RESOLVED

-- 
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 69200] SPAM SPAM SPAM SPAM

2024-07-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69200

Chuck Caldarale  changed:

   What|Removed |Added

 Resolution|FIXED   |INVALID
Summary|Fethiye Tour|SPAM SPAM SPAM SPAM

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