(shiro) branch main updated: [integeration-tests] Fix groovy script indentation for jakarta-ee

[fpapon]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 117069332 [integeration-tests] Fix groovy script indentation for 
jakarta-ee
117069332 is described below

commit 117069332f731c283be7729d26ffe4d16ba4388a
Author: francois papon <fpa...@apache.org>
AuthorDate: Sun Nov 2 21:40:06 2025 +0100

    [integeration-tests] Fix groovy script indentation for jakarta-ee
---
 integration-tests/jakarta-ee/pom.xml               |  4 ++-
 .../jakarta-ee/src/main/resources/script.groovy    | 34 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/integration-tests/jakarta-ee/pom.xml 
b/integration-tests/jakarta-ee/pom.xml
index d4bb89055..4d0eccdf0 100644
--- a/integration-tests/jakarta-ee/pom.xml
+++ b/integration-tests/jakarta-ee/pom.xml
@@ -382,7 +382,9 @@
                                         int portbase = 4900 + (executor_number 
as int) * port_increment
                                         int adminPort
                                         // find a free port
-                                        for (; portbase < 10000; portbase += 
port_increment) { def server_socket adminPort = portbase + admin_port_increment
+                                        for (; portbase < 10000; portbase += 
port_increment) {
+                                        def server_socket
+                                        adminPort = portbase + 
admin_port_increment
                                             try {
                                                 server_socket = new 
ServerSocket()
                                                 server_socket.setReuseAddress 
true
diff --git a/integration-tests/jakarta-ee/src/main/resources/script.groovy 
b/integration-tests/jakarta-ee/src/main/resources/script.groovy
new file mode 100644
index 000000000..8bddc38a6
--- /dev/null
+++ b/integration-tests/jakarta-ee/src/main/resources/script.groovy
@@ -0,0 +1,34 @@
+def executor_number = System.getenv('EXECUTOR_NUMBER')
+if (executor_number != null) {
+    final int port_increment = 100
+    final int admin_port_increment = 48
+    int portbase = 4900 + (executor_number as int) * port_increment
+    int adminPort
+    // find a free port
+    for (; portbase < 10000; portbase += port_increment) {
+        def server_socket
+        adminPort = portbase + admin_port_increment
+        try {
+            server_socket = new ServerSocket()
+            server_socket.setReuseAddress true
+            server_socket.bind(new InetSocketAddress(adminPort))
+            break
+        } catch (IOException e) {
+            println "Admin port $adminPort is busy, trying next"
+        } finally {
+            server_socket?.close()
+        }
+    }
+
+    int httpsPort = portbase + 81
+
+    project.properties.'payara.portbase' = portbase as String
+    project.properties.'payara.adminport' = adminPort as String
+    project.properties.'payara.argLine' = "-DadminPort=$adminPort 
-Dpayara.https.port=$httpsPort" as String
+    project.properties.'payara.restart.skip' = 
project.properties.'payara.start.skip'
+    println "Payara: portbase = ${project.properties.'payara.portbase'}, " +
+            "argLine = ${project.properties.'payara.argLine'}"
+} else {
+    project.properties.'payara.argLine' = ''
+    project.properties.'payara.restart.skip' = 'true'
+}