Remove shrinkwrap-descriptors dependency

pom.xml

@@ -72,7 +72,6 @@
     <version.arquillian.core>1.10.0.Final</version.arquillian.core>
     <version.arquillian.jakarta>10.0.0.Final</version.arquillian.jakarta>
     <version.shrinkwrap>1.2.6</version.shrinkwrap>
-    <version.shrinkwrap.descriptors>2.0.0</version.shrinkwrap.descriptors>
     <version.shrinkwrap.resolver>3.3.5</version.shrinkwrap.resolver>
     <version.weld.jakarta>5.1.7.Final</version.weld.jakarta>
 
@@ -114,13 +113,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-        <artifactId>shrinkwrap-descriptors-bom</artifactId>
-        <version>${version.shrinkwrap.descriptors}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-bom</artifactId>
@@ -170,11 +162,6 @@
       <artifactId>shrinkwrap-depchain</artifactId>
       <type>pom</type>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-      <artifactId>shrinkwrap-descriptors-depchain</artifactId>
-      <type>pom</type>
-    </dependency>
     <dependency>
       <groupId>org.jboss.shrinkwrap.resolver</groupId>
       <artifactId>shrinkwrap-resolver-depchain</artifactId>

tomcat-common/src/main/java/org/jboss/arquillian/container/tomcat/AdditionalJavaOptionsParser.java

@@ -49,7 +49,7 @@ public static List<String> parse(final String additionalOptions) {
             final Pattern p = Pattern.compile(OPTION, Pattern.DOTALL);
             final Matcher m = p.matcher(additionalOptions);
             while (m.find()) {
-                if (!m.group().trim().equals("")) {
+                if (!m.group().trim().isEmpty()) {
                     options.add(
                         Pattern.compile(QUOTED_CONTENT, Pattern.DOTALL).matcher(m.group().trim()).replaceAll("$1"));
                 }

tomcat-common/src/main/java/org/jboss/arquillian/container/tomcat/ProtocolMetadataParser.java

@@ -94,7 +94,7 @@ public ProtocolMetaData retrieveContextServletInfo(final String context) throws
             final String servletName = oi.getObjectName().getKeyProperty("name");
             httpContext.add(new Servlet(servletName, context));
             if (log.isLoggable(Level.FINE)) {
-                log.fine("Added servlet " + oi.toString() + " to HttpContext for archive" + context);
+                log.fine("Added servlet " + oi + " to HttpContext for archive" + context);
             }
         }
 

tomcat-common/src/main/java/org/jboss/arquillian/container/tomcat/ShrinkWrapUtil.java

@@ -18,29 +18,20 @@
 package org.jboss.arquillian.container.tomcat;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.net.URL;
 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
-import org.jboss.shrinkwrap.descriptor.api.Descriptor;
 
 /**
- * ShrinkWrapUtil
- *
  * @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
  */
 public final class ShrinkWrapUtil {
 
-    private ShrinkWrapUtil() {
-
-    }
-
     /**
      * Creates a tmp folder and exports the file. Returns the URL for that file location.
      *
-     * @param archive
-     *     Archive to export
+     * @param archive Archive to export
      */
     public static URL toURL(final Archive<?> archive) {
 
@@ -59,31 +50,8 @@ public static URL toURL(final Archive<?> archive) {
         }
     }
 
-    public static URL toURL(final Descriptor descriptor) {
-
-        // create a random named temp file, then delete and use it as a directory
-        try {
-            final File root = File.createTempFile("arquillian", descriptor.getDescriptorName());
-            root.delete();
-            root.mkdirs();
-
-            final File deployment = new File(root, descriptor.getDescriptorName());
-            deployment.deleteOnExit();
 
-            final FileOutputStream stream = new FileOutputStream(deployment);
-            try {
-                descriptor.exportTo(stream);
-            } finally {
-                try {
-                    stream.close();
-                } catch (final Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-            return deployment.toURI().toURL();
-        } catch (final Exception e) {
-            throw new RuntimeException("Could not export deployment to temp", e);
-        }
+    private ShrinkWrapUtil() {
+        // Util class.
     }
 }

tomcat-common/src/main/java/org/jboss/arquillian/container/tomcat/Validate.java

@@ -140,7 +140,7 @@ public static void isValidFile(final String path, final String message) throws I
     public static void configurationDirectoryExists(final String string, final String message)
         throws ConfigurationException {
 
-        if (string == null || string.length() == 0 || new File(string).isDirectory() == false) {
+        if (string == null || string.length() == 0 || !new File(string).isDirectory()) {
             throw new ConfigurationException(message);
         }
     }

tomcat-embedded-10/src/main/java/org/jboss/arquillian/container/tomcat/embedded/EmbeddedContextConfig.java

@@ -60,7 +60,7 @@ public EmbeddedContextConfig() {
     @Override
     protected synchronized void beforeStart() {
         super.beforeStart();
-        ((StandardContext) context).setJ2EEServer("Arquillian-" + UUID.randomUUID().toString());
+        ((StandardContext) context).setJ2EEServer("Arquillian-" + UUID.randomUUID());
         Tomcat.initWebappDefaults(context);
     }
 

tomcat-embedded-10/src/main/java/org/jboss/arquillian/container/tomcat/embedded/Tomcat10EmbeddedContainer.java

@@ -35,7 +35,6 @@
 import org.jboss.arquillian.core.api.annotation.Inject;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
-import org.jboss.shrinkwrap.descriptor.api.Descriptor;
 
 import java.io.File;
 import java.io.IOException;
@@ -102,7 +101,7 @@ public ProtocolDescription getDefaultProtocol() {
     public void setup(final TomcatEmbeddedConfiguration configuration) {
         final String serverName = configuration.getServerName();
 
-        if (serverName == null || "".equals(serverName)) {
+        if (serverName == null || serverName.isEmpty()) {
             configuration.setServerName("arquillian-tomcat-embedded-10");
         }
 
@@ -169,16 +168,6 @@ public void undeploy(final Archive<?> archive) throws DeploymentException {
         }
     }
 
-    @Override
-    public void deploy(final Descriptor descriptor) throws DeploymentException {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public void undeploy(final Descriptor descriptor) throws DeploymentException {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
     protected void startTomcatEmbedded() throws LifecycleException, org.apache.catalina.LifecycleException {
         /*
          * Derived from setUp() in

tomcat-managed-common/src/main/java/org/jboss/arquillian/container/tomcat/managed/TomcatManagedConfiguration.java

@@ -58,7 +58,7 @@ public class TomcatManagedConfiguration extends TomcatConfiguration {
 
     public TomcatManagedConfiguration() {
         // if no javaHome set, reuse this Java JVM
-        if (javaHome == null || "".equals(javaHome)) {
+        if (javaHome == null || javaHome.isEmpty()) {
             javaHome = System.getProperty(JAVA_HOME_SYSTEM_PROPERTY);
         }
     }

tomcat-managed-common/src/main/java/org/jboss/arquillian/container/tomcat/managed/TomcatManagedContainer.java

@@ -39,7 +39,6 @@
 import org.jboss.arquillian.container.tomcat.TomcatManagerCommandSpec;
 import org.jboss.arquillian.container.tomcat.Validate;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptor;
 
 /**
  * <p>
@@ -128,9 +127,9 @@ public void start() throws LifecycleException {
             final List<String> cmd = new ArrayList<String>();
 
             cmd.add(javaCommand);
-            String seperator = File.separator;
+            String separator = File.separator;
 
-            cmd.add("-Djava.util.logging.config.file=" + absoluteCatalinaBasePath + seperator + "conf" + seperator
+            cmd.add("-Djava.util.logging.config.file=" + absoluteCatalinaBasePath + separator + "conf" + separator
                 + configuration.getLoggingProperties());
             cmd.add("-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager");
 
@@ -141,28 +140,28 @@ public void start() throws LifecycleException {
             cmd.addAll(AdditionalJavaOptionsParser.parse(ADDITIONAL_JAVA_OPTS));
 
             String CLASS_PATH =
-                absoluteCatalinaHomePath + seperator + "bin" + seperator + "bootstrap.jar" + File.pathSeparator;
-            CLASS_PATH += absoluteCatalinaHomePath + seperator + "bin" + seperator + "tomcat-juli.jar";
+                absoluteCatalinaHomePath + separator + "bin" + separator + "bootstrap.jar" + File.pathSeparator;
+            CLASS_PATH += absoluteCatalinaHomePath + separator + "bin" + separator + "tomcat-juli.jar";
 
             cmd.add("-classpath");
             cmd.add(CLASS_PATH);
-            final File endorsed = new File(absoluteCatalinaHomePath + seperator + "endorsed");
+            final File endorsed = new File(absoluteCatalinaHomePath + separator + "endorsed");
             if (endorsed.exists()) {
                 cmd.add("-Djava.endorsed.dirs=" + endorsed.getAbsolutePath());
             }
             cmd.add("-Dcatalina.base=" + absoluteCatalinaBasePath);
             cmd.add("-Dcatalina.home=" + absoluteCatalinaHomePath);
-            cmd.add("-Djava.io.tmpdir=" + absoluteCatalinaBasePath + seperator + "temp");
+            cmd.add("-Djava.io.tmpdir=" + absoluteCatalinaBasePath + separator + "temp");
             cmd.add("org.apache.catalina.startup.Bootstrap");
             cmd.add("-config");
-            cmd.add(absoluteCatalinaBasePath + seperator + "conf" + seperator + configuration.getServerConfig());
+            cmd.add(absoluteCatalinaBasePath + separator + "conf" + separator + configuration.getServerConfig());
             cmd.add("start");
 
             // execute command
             final ProcessBuilder startupProcessBuilder = new ProcessBuilder(cmd);
             startupProcessBuilder.redirectErrorStream(true);
             startupProcessBuilder.directory(new File(configuration.getCatalinaHome() + "/bin"));
-            log.info("Starting Tomcat with: " + cmd.toString());
+            log.info("Starting Tomcat with: " + cmd);
             startupProcess = startupProcessBuilder.start();
             new Thread(new ConsoleConsumer(configuration.isOutputToConsole())).start();
             final Process proc = startupProcess;
@@ -187,7 +186,7 @@ public void run() {
             final long startupTimeout = configuration.getStartupTimeoutInSeconds();
             long timeout = startupTimeout * 1000;
             boolean serverAvailable = false;
-            while (timeout > 0 && serverAvailable == false) {
+            while (timeout > 0 && !serverAvailable) {
                 serverAvailable = manager.isRunning();
                 if (!serverAvailable) {
                     Thread.sleep(100);
@@ -223,7 +222,7 @@ public void stop() throws LifecycleException {
     }
 
     /**
-     * Deploys to remote Tomcat using it's /manager web-app's org.apache.catalina.manager.ManagerServlet.
+     * Deploys to remote Tomcat using its /manager web-app's org.apache.catalina.manager.ManagerServlet.
      *
      * @throws org.jboss.arquillian.container.spi.client.container.DeploymentException
      */
@@ -258,18 +257,6 @@ public void undeploy(final Archive<?> archive) throws DeploymentException {
         }
     }
 
-    @Override
-    public void deploy(final Descriptor descriptor) throws DeploymentException {
-
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public void undeploy(final Descriptor descriptor) throws DeploymentException {
-
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
     /**
      * Runnable that consumes the output of the startupProcess. If nothing consumes the output the AS will hang on some
      * platforms

tomcat-remote-common/src/main/java/org/jboss/arquillian/container/tomcat/remote/TomcatRemoteContainer.java

@@ -21,7 +21,6 @@
 
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
 import org.jboss.arquillian.container.spi.client.container.DeploymentException;
-import org.jboss.arquillian.container.spi.client.container.LifecycleException;
 import org.jboss.arquillian.container.spi.client.deployment.Validate;
 import org.jboss.arquillian.container.spi.client.protocol.ProtocolDescription;
 import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
@@ -30,7 +29,6 @@
 import org.jboss.arquillian.container.tomcat.TomcatManager;
 import org.jboss.arquillian.container.tomcat.TomcatManagerCommandSpec;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptor;
 
 /**
  * Arquillian {@link DeployableContainer} implementation for a remote Tomcat server; responsible for both deployment
@@ -71,26 +69,6 @@ public void setup(final TomcatRemoteConfiguration configuration) {
         this.manager = new TomcatManager<>(configuration, tomcatManagerCommandSpec);
     }
 
-    @Override
-    public void start() throws LifecycleException {
-        // no-op
-    }
-
-    @Override
-    public void stop() throws LifecycleException {
-        // no-op
-    }
-
-    @Override
-    public void deploy(final Descriptor descriptor) throws DeploymentException {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public void undeploy(final Descriptor descriptor) throws DeploymentException {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
     /**
      * Deploys to remote Tomcat using its /manager web-app's org.apache.catalina.manager.ManagerServlet.
      *