Remove IcePatch2 (#602)

Removed IcePatch2 and the corresponding distrib and patching features in IceGrid and IceGridGUI.

21 files changed, 26 insertions, 553 deletions

diff --git a/java/README.md b/java/README.md
index 0056a49ca08..ac9865a7a76 100644
--- a/java/README.md
+++ b/java/README.md
@@ -3,20 +3,24 @@
 This page describes how to build and install Ice for Java from source. If
 you prefer, you can also download a [binary distribution][1].
 
-* [Build Requirements](#build-requirements)
-  * [Operating Systems](#operating-systems)
-  * [Slice to Java Compiler](#slice-to-java-compiler)
-  * [Java Version](#java-version)
-  * [Gradle](#gradle)
-  * [Bzip2 Compression](#bzip2-compression)
-  * [JGoodies](#jgoodies)
-  * [ProGuard](#proguard)
-  * [Java Application Bundler](#java-application-bundler)
-* [Building Ice for Java](#building-ice-for-java-1)
-* [Installing Ice for Java](#installing-ice-for-java)
-* [Running the Java Tests](#running-the-java-tests)
-* [Building the Ice for Android Tests](#building-the-ice-for-android-tests)
-* [IceGrid GUI Tool](#icegrid-gui-tool)
+- [Building Ice for Java](#building-ice-for-java)
+  - [Build Requirements](#build-requirements)
+    - [Operating Systems](#operating-systems)
+    - [Slice to Java Compiler](#slice-to-java-compiler)
+    - [Java Version](#java-version)
+    - [Gradle](#gradle)
+    - [Bzip2 Compression](#bzip2-compression)
+    - [JGoodies](#jgoodies)
+    - [ProGuard](#proguard)
+    - [Java Application Bundler](#java-application-bundler)
+  - [Building Ice for Java](#building-ice-for-java-1)
+  - [Installing Ice for Java](#installing-ice-for-java)
+  - [Running the Java Tests](#running-the-java-tests)
+  - [Building the Ice for Android Tests](#building-the-ice-for-android-tests)
+    - [Android Build Requirements](#android-build-requirements)
+    - [Building the Android Test Controller](#building-the-android-test-controller)
+    - [Running the Android Test Suite](#running-the-android-test-suite)
+  - [IceGrid GUI Tool](#icegrid-gui-tool)
 
 ## Build Requirements
 
@@ -176,7 +180,6 @@ icediscovery-3.7.5.jar
 icegrid-3.7.5.jar
 icegridgui.jar
 icelocatordiscovery-3.7.5.jar
-icepatch2-3.7.5.jar
 icessl-3.7.5.jar
 icestorm-3.7.5.jar
 ```
diff --git a/java/build.gradle b/java/build.gradle
index f62f76c0cc2..db65571403d 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -62,7 +62,6 @@ if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')
         ":icebox",
         ":icebt",
         ":icegrid",
-        ":icepatch2",
         ":icessl",
         ":icestorm"
     ]
@@ -107,7 +106,6 @@ if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')
     dist.dependsOn(project(":icebt").assemble)
     dist.dependsOn(project(":icediscovery").assemble)
     dist.dependsOn(project(":icelocatordiscovery").assemble)
-    dist.dependsOn(project(":icepatch2").assemble)
     dist.dependsOn(project(":icestorm").assemble)
     dist.dependsOn(project(":IceGridGUI").assemble)
 }
diff --git a/java/settings.gradle b/java/settings.gradle
index b5c45c7b2ad..f7ecda52820 100644
--- a/java/settings.gradle
+++ b/java/settings.gradle
@@ -18,8 +18,6 @@ if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')
     project(':icebox').projectDir = new File('src/IceBox')
     include ':glacier2'
     project(':glacier2').projectDir = new File('src/Glacier2')
-    include ':icepatch2'
-    project(':icepatch2').projectDir = new File('src/IcePatch2')
     include ':icestorm'
     project(':icestorm').projectDir = new File('src/IceStorm')
     include ':icegrid'
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
index 6677d92cadc..cd52c3e604f 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
@@ -780,7 +780,6 @@ public final class Util
         "::IceGrid::",
         "::IceLocatorDiscovery::",
         "::IceMX::",
-        "::IcePatch2::",
         "::IceStorm::"
     };
 }
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
index 3ba05d0bde6..878ba11d9dd 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
@@ -1,7 +1,7 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Jul  2 14:55:02 2020
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 29 15:05:58 2021
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -1031,60 +1031,6 @@ public final class PropertyNames
         null
     };
 
-    public static final Property IcePatch2Props[] =
-    {
-        new Property("IcePatch2\\.ACM\\.Timeout", false, null),
-        new Property("IcePatch2\\.ACM\\.Heartbeat", false, null),
-        new Property("IcePatch2\\.ACM\\.Close", false, null),
-        new Property("IcePatch2\\.ACM", false, null),
-        new Property("IcePatch2\\.AdapterId", false, null),
-        new Property("IcePatch2\\.Endpoints", false, null),
-        new Property("IcePatch2\\.Locator\\.EndpointSelection", false, null),
-        new Property("IcePatch2\\.Locator\\.ConnectionCached", false, null),
-        new Property("IcePatch2\\.Locator\\.PreferSecure", false, null),
-        new Property("IcePatch2\\.Locator\\.LocatorCacheTimeout", false, null),
-        new Property("IcePatch2\\.Locator\\.InvocationTimeout", false, null),
-        new Property("IcePatch2\\.Locator\\.Locator", false, null),
-        new Property("IcePatch2\\.Locator\\.Router", false, null),
-        new Property("IcePatch2\\.Locator\\.CollocationOptimized", false, null),
-        new Property("IcePatch2\\.Locator\\.Context\\.[^\\s]+", false, null),
-        new Property("IcePatch2\\.Locator", false, null),
-        new Property("IcePatch2\\.PublishedEndpoints", false, null),
-        new Property("IcePatch2\\.ReplicaGroupId", false, null),
-        new Property("IcePatch2\\.Router\\.EndpointSelection", false, null),
-        new Property("IcePatch2\\.Router\\.ConnectionCached", false, null),
-        new Property("IcePatch2\\.Router\\.PreferSecure", false, null),
-        new Property("IcePatch2\\.Router\\.LocatorCacheTimeout", false, null),
-        new Property("IcePatch2\\.Router\\.InvocationTimeout", false, null),
-        new Property("IcePatch2\\.Router\\.Locator", false, null),
-        new Property("IcePatch2\\.Router\\.Router", false, null),
-        new Property("IcePatch2\\.Router\\.CollocationOptimized", false, null),
-        new Property("IcePatch2\\.Router\\.Context\\.[^\\s]+", false, null),
-        new Property("IcePatch2\\.Router", false, null),
-        new Property("IcePatch2\\.ProxyOptions", false, null),
-        new Property("IcePatch2\\.ThreadPool\\.Size", false, null),
-        new Property("IcePatch2\\.ThreadPool\\.SizeMax", false, null),
-        new Property("IcePatch2\\.ThreadPool\\.SizeWarn", false, null),
-        new Property("IcePatch2\\.ThreadPool\\.StackSize", false, null),
-        new Property("IcePatch2\\.ThreadPool\\.Serialize", false, null),
-        new Property("IcePatch2\\.ThreadPool\\.ThreadIdleTime", false, null),
-        new Property("IcePatch2\\.ThreadPool\\.ThreadPriority", false, null),
-        new Property("IcePatch2\\.MessageSizeMax", false, null),
-        new Property("IcePatch2\\.Directory", false, null),
-        new Property("IcePatch2\\.InstanceName", false, null),
-        null
-    };
-
-    public static final Property IcePatch2ClientProps[] =
-    {
-        new Property("IcePatch2Client\\.ChunkSize", false, null),
-        new Property("IcePatch2Client\\.Directory", false, null),
-        new Property("IcePatch2Client\\.Proxy", false, null),
-        new Property("IcePatch2Client\\.Remove", false, null),
-        new Property("IcePatch2Client\\.Thorough", false, null),
-        null
-    };
-
     public static final Property IceSSLProps[] =
     {
         new Property("IceSSL\\.Alias", false, null),
@@ -1344,8 +1290,6 @@ public final class PropertyNames
         IceBridgeProps,
         IceGridAdminProps,
         IceGridProps,
-        IcePatch2Props,
-        IcePatch2ClientProps,
         IceSSLProps,
         IceStormAdminProps,
         IceBTProps,
@@ -1366,8 +1310,6 @@ public final class PropertyNames
         "IceBridge",
         "IceGridAdmin",
         "IceGrid",
-        "IcePatch2",
-        "IcePatch2Client",
         "IceSSL",
         "IceStormAdmin",
         "IceBT",
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ApplicationEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ApplicationEditor.java
index 3a36fd71e73..ffcf470757b 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ApplicationEditor.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ApplicationEditor.java
@@ -88,22 +88,6 @@ class ApplicationEditor extends Editor
         // Variables
         //
         _variables = new SimpleMapField(this, false, "Name", "Value");
-
-        //
-        // Distrib
-        //
-        _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB});
-        _distrib.setEditable(true);
-        _distrib.setToolTipText("The proxy to the IcePatch2 server holding your files");
-
-        JTextField distribTextField = (JTextField)_distrib.getEditor().getEditorComponent();
-        distribTextField.getDocument().addDocumentListener(_updateListener);
-
-        _distribDirs.getDocument().addDocumentListener(_updateListener);
-        _distribDirs.setToolTipText(
-            "<html>Include only these directories when patching.<br>"
-            + "Use whitespace as separator; use double-quotes around directories containing whitespaces</html>");
-
     }
 
     @Override
@@ -134,15 +118,6 @@ class ApplicationEditor extends Editor
         builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
         builder.nextRow(6);
         builder.nextLine();
-
-        JComponent c = builder.appendSeparator("Distribution");
-        c.setToolTipText("Files shared by all servers in your application");
-        builder.append("IcePatch2 Proxy");
-        builder.append(_distrib, 3);
-        builder.nextLine();
-        builder.append("Directories");
-        builder.append(_distribDirs, 3);
-        builder.nextLine();
     }
 
     @Override
@@ -164,16 +139,6 @@ class ApplicationEditor extends Editor
         descriptor.name = _name.getText().trim();
         descriptor.variables = _variables.get();
         descriptor.description = _description.getText();
-
-        if(_distrib.getSelectedItem() == NO_DISTRIB)
-        {
-            descriptor.distrib.icepatch = "";
-        }
-        else
-        {
-            descriptor.distrib.icepatch = _distrib.getSelectedItem().toString().trim();
-        }
-        descriptor.distrib.directories = _distribDirs.getList();
     }
 
     @Override
@@ -202,23 +167,6 @@ class ApplicationEditor extends Editor
 
         _variables.set(descriptor.variables, resolver, isEditable);
 
-        _distrib.setEnabled(true);
-        _distrib.setEditable(true);
-        String icepatch = Utils.substitute(descriptor.distrib.icepatch, resolver);
-        if(icepatch.equals(""))
-        {
-            _distrib.setSelectedItem(NO_DISTRIB);
-        }
-        else
-        {
-            _distrib.setSelectedItem(icepatch);
-        }
-        _distrib.setEnabled(isEditable);
-        _distrib.setEditable(isEditable);
-
-        _distribDirs.setList(descriptor.distrib.directories, resolver);
-        _distribDirs.setEditable(isEditable);
-
         _applyButton.setEnabled(false);
         _discardButton.setEnabled(false);
         detectUpdates(true);
@@ -237,19 +185,7 @@ class ApplicationEditor extends Editor
         }
     }
 
-    static private final Object NO_DISTRIB = new Object()
-        {
-            @Override
-            public String toString()
-            {
-                return "None selected";
-            }
-        };
-    static private final String DEFAULT_DISTRIB = "${application}.IcePatch2/server";
-
     private JTextField _name = new JTextField(20);
     private JTextArea _description = new JTextArea(3, 20);
     private SimpleMapField _variables;
-    private JComboBox _distrib;
-    private ListTextField _distribDirs = new ListTextField(20);
 }
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServer.java
index 0a9aa8446c0..f157682454e 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServer.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServer.java
@@ -27,8 +27,6 @@ class PlainServer extends Communicator implements Server
 
         copy.propertySet = PropertySet.copyDescriptor(copy.propertySet);
 
-        copy.distrib = copy.distrib.clone();
-
         if(copy instanceof IceBoxDescriptor)
         {
             IceBoxDescriptor ib = (IceBoxDescriptor)copy;
@@ -52,9 +50,6 @@ class PlainServer extends Communicator implements Server
         into.activation = from.activation;
         into.activationTimeout = from.activationTimeout;
         into.deactivationTimeout = from.deactivationTimeout;
-        into.applicationDistrib = from.applicationDistrib;
-        into.distrib.icepatch = from.distrib.icepatch;
-        into.distrib.directories = from.distrib.directories;
     }
 
     static public ServerDescriptor newServerDescriptor()
@@ -74,8 +69,6 @@ class PlainServer extends Communicator implements Server
             "manual",
             "",
             "",
-            true,
-            new DistributionDescriptor("", new java.util.LinkedList<String>()),
             false, // Allocatable
             "");
     }
@@ -97,8 +90,6 @@ class PlainServer extends Communicator implements Server
             "manual",
             "",
             "",
-            true,
-            new DistributionDescriptor("", new java.util.LinkedList<String>()),
             false, // Allocatable
             "",
             new java.util.LinkedList<ServiceInstanceDescriptor>()
@@ -239,7 +230,6 @@ class PlainServer extends Communicator implements Server
     public Object saveDescriptor()
     {
         ServerDescriptor clone = _descriptor.clone();
-        clone.distrib = clone.distrib.clone();
         return clone;
     }
 
@@ -289,10 +279,6 @@ class PlainServer extends Communicator implements Server
         {
             attributes.add(createAttribute("activation-timeout", descriptor.activationTimeout));
         }
-        if(!descriptor.applicationDistrib)
-        {
-            attributes.add(createAttribute("application-distrib", "false"));
-        }
         if(descriptor.deactivationTimeout.length() > 0)
         {
             attributes.add(createAttribute("deactivation-timeout", descriptor.deactivationTimeout));
@@ -350,7 +336,6 @@ class PlainServer extends Communicator implements Server
 
                 writePropertySet(writer, "", "", _descriptor.propertySet, _descriptor.adapters, _descriptor.logs);
                 writeLogs(writer, _descriptor.logs, _descriptor.propertySet.properties);
-                writeDistribution(writer, _descriptor.distrib);
 
                 _adapters.write(writer, _descriptor.propertySet.properties);
                 _services.write(writer);
@@ -370,7 +355,6 @@ class PlainServer extends Communicator implements Server
 
                 writePropertySet(writer, _descriptor.propertySet, _descriptor.adapters, _descriptor.logs);
                 writeLogs(writer, _descriptor.logs, _descriptor.propertySet.properties);
-                writeDistribution(writer, _descriptor.distrib);
 
                 _adapters.write(writer, _descriptor.propertySet.properties);
                 _dbEnvs.write(writer);
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java
index 5e08f5d8776..ef0bf55510d 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java
@@ -74,7 +74,6 @@ public class Root extends ListTreeNode
 
         _origVariables = _descriptor.variables;
         _origDescription = _descriptor.description;
-        _origDistrib = _descriptor.distrib.clone();
 
         _propertySets = new PropertySets(this, _descriptor.propertySets);
         _replicaGroups = new ReplicaGroups(this, _descriptor.replicaGroups);
@@ -114,7 +113,6 @@ public class Root extends ListTreeNode
 
         copy.nodes = Nodes.copyDescriptors(copy.nodes);
 
-        copy.distrib = copy.distrib.clone();
         return copy;
     }
 
@@ -837,14 +835,6 @@ public class Root extends ListTreeNode
                 }
             }
             update.removeVariables = removeVariables.toArray(new String[0]);
-
-            //
-            // Diff distribution
-            //
-            if(!_descriptor.distrib.equals(_origDistrib))
-            {
-                update.distrib = new com.zeroc.IceGrid.BoxedDistributionDescriptor(_descriptor.distrib);
-            }
         }
         else
         {
@@ -916,7 +906,6 @@ public class Root extends ListTreeNode
         _editable.commit();
         _origVariables = _descriptor.variables;
         _origDescription = _descriptor.description;
-        _origDistrib = _descriptor.distrib.clone();
 
         _nodes.commit();
         _propertySets.commit();
@@ -1018,15 +1007,6 @@ public class Root extends ListTreeNode
             _descriptor.variables.putAll(desc.variables);
 
             //
-            // Distrib
-            //
-            if(desc.distrib != null)
-            {
-                _descriptor.distrib = desc.distrib.value;
-                _origDistrib = _descriptor.distrib.clone();
-            }
-
-            //
             // Property Sets
             //
             for(String id : desc.removePropertySets)
@@ -1211,7 +1191,6 @@ public class Root extends ListTreeNode
     ApplicationDescriptor saveDescriptor()
     {
         ApplicationDescriptor clone = _descriptor.clone();
-        clone.distrib = clone.distrib.clone();
         return clone;
     }
 
@@ -1219,8 +1198,6 @@ public class Root extends ListTreeNode
     {
         _descriptor.name = clone.name;
         _descriptor.variables = clone.variables;
-        _descriptor.distrib.icepatch = clone.distrib.icepatch;
-        _descriptor.distrib.directories = clone.distrib.directories;
         _descriptor.description = clone.description;
     }
 
@@ -1240,7 +1217,6 @@ public class Root extends ListTreeNode
             writer.writeElement("description", _descriptor.description);
         }
         writeVariables(writer, _descriptor.variables);
-        writeDistribution(writer, _descriptor.distrib);
 
         _serviceTemplates.write(writer);
         _serverTemplates.write(writer);
@@ -1457,7 +1433,6 @@ public class Root extends ListTreeNode
     //
     private java.util.Map<String, String> _origVariables;
     private String _origDescription;
-    private DistributionDescriptor _origDistrib;
 
     //
     // When this application (and children) is being updated, we
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java
index 5cdcce37c51..39ba458a22e 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java
@@ -90,31 +90,6 @@ class ServerSubEditor extends CommunicatorSubEditor
                              "<html>Check this box to ensure that the well-known objects<br>"
                              + "of this server can only be allocated by one session at a time.</html>");
         _allocatable = new JCheckBox(allocatable);
-
-        Action appDistrib = new AbstractAction("Depends on the application distribution")
-            {
-                @Override
-                public void actionPerformed(ActionEvent e)
-                {
-                    _mainEditor.updated();
-                }
-            };
-        appDistrib.putValue(Action.SHORT_DESCRIPTION,
-                            "<html>Check this box if this server needs to be restarted<br>"
-                            + "each time the distribution for your application is refreshed.</html>");
-
-        _applicationDistrib = new JCheckBox(appDistrib);
-
-        _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB});
-        _distrib.setToolTipText("The proxy to the IcePatch2 server holding your files");
-
-        JTextField distribTextField = (JTextField)_distrib.getEditor().getEditorComponent();
-        distribTextField.getDocument().addDocumentListener(_mainEditor.getUpdateListener());
-
-        _distribDirs.getDocument().addDocumentListener(_mainEditor.getUpdateListener());
-        _distribDirs.setToolTipText(
-            "<html>Include only these directories when patching.<br>"
-            + "Use whitespace as separator; use double-quotes around directories containing whitespaces</html>");
     }
 
     ServerDescriptor getServerDescriptor()
@@ -175,18 +150,6 @@ class ServerSubEditor extends CommunicatorSubEditor
         builder.nextLine();
         builder.append("", _allocatable);
         builder.nextLine();
-
-        JComponent c = builder.appendSeparator("Distribution");
-        c.setToolTipText("Files specific to this server");
-
-        builder.append("", _applicationDistrib);
-        builder.nextLine();
-        builder.append("IcePatch2 Proxy");
-        builder.append(_distrib, 3);
-        builder.nextLine();
-        builder.append("Directories");
-        builder.append(_distribDirs, 3);
-        builder.nextLine();
     }
 
     void writeDescriptor()
@@ -212,18 +175,6 @@ class ServerSubEditor extends CommunicatorSubEditor
 
         descriptor.allocatable = _allocatable.isSelected();
 
-        descriptor.applicationDistrib = _applicationDistrib.isSelected();
-
-        if(_distrib.getSelectedItem() == NO_DISTRIB)
-        {
-            descriptor.distrib.icepatch = "";
-        }
-        else
-        {
-            descriptor.distrib.icepatch = _distrib.getSelectedItem().toString().trim();
-        }
-        descriptor.distrib.directories = _distribDirs.getList();
-
         super.writeDescriptor(descriptor);
     }
 
@@ -321,26 +272,6 @@ class ServerSubEditor extends CommunicatorSubEditor
         _allocatable.setSelected(descriptor.allocatable);
         _allocatable.setEnabled(isEditable);
 
-        _applicationDistrib.setSelected(descriptor.applicationDistrib);
-        _applicationDistrib.setEnabled(isEditable);
-
-        _distrib.setEnabled(true);
-        _distrib.setEditable(true);
-        String icepatch = Utils.substitute(descriptor.distrib.icepatch, detailResolver);
-        if(icepatch.equals(""))
-        {
-            _distrib.setSelectedItem(NO_DISTRIB);
-        }
-        else
-        {
-            _distrib.setSelectedItem(icepatch);
-        }
-        _distrib.setEnabled(isEditable);
-        _distrib.setEditable(isEditable);
-
-        _distribDirs.setList(descriptor.distrib.directories, detailResolver);
-        _distribDirs.setEditable(isEditable);
-
         show(descriptor, isEditable);
     }
 
@@ -349,17 +280,6 @@ class ServerSubEditor extends CommunicatorSubEditor
     static private final String ON_DEMAND = "on-demand";
     static private final String SESSION = "session";
 
-    static private final Object NO_DISTRIB = new Object()
-        {
-            @Override
-            public String toString()
-            {
-                return "None selected";
-            }
-        };
-
-    static private final String DEFAULT_DISTRIB = "${application}.IcePatch2/server";
-
     private JTextField _id = new JTextField(20);
     private JTextField _exe = new JTextField(20);
     private JTextField _iceVersion = new JTextField(20);
@@ -372,7 +292,4 @@ class ServerSubEditor extends CommunicatorSubEditor
     private JTextField _activationTimeout = new JTextField(20);
     private JTextField _deactivationTimeout = new JTextField(20);
     private JCheckBox _allocatable;
-    private JCheckBox _applicationDistrib;
-    private JComboBox _distrib;
-    private ListTextField _distribDirs = new ListTextField(20);
 }
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplate.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplate.java
index feac5a1dad2..21780277fe6 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplate.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplate.java
@@ -256,7 +256,6 @@ class ServerTemplate extends Communicator
 
                 writePropertySet(writer, "", "", descriptor.propertySet, descriptor.adapters, descriptor.logs);
                 writeLogs(writer, descriptor.logs, descriptor.propertySet.properties);
-                writeDistribution(writer, descriptor.distrib);
 
                 _adapters.write(writer, descriptor.propertySet.properties);
                 _services.write(writer);
@@ -277,7 +276,6 @@ class ServerTemplate extends Communicator
 
                 writePropertySet(writer, descriptor.propertySet, descriptor.adapters, descriptor.logs);
                 writeLogs(writer, descriptor.logs, descriptor.propertySet.properties);
-                writeDistribution(writer, descriptor.distrib);
 
                 _adapters.write(writer, descriptor.propertySet.properties);
                 _dbEnvs.write(writer);
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TreeNode.java
index 40bcebcaf34..6f45c45d2d7 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TreeNode.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TreeNode.java
@@ -225,30 +225,6 @@ public abstract class TreeNode extends TreeNodeBase
         return null;
     }
 
-    static void writeDistribution(XMLWriter writer, DistributionDescriptor descriptor)
-        throws java.io.IOException
-    {
-        if(descriptor.icepatch.length() > 0)
-        {
-            java.util.List<String[]> attributes = new java.util.LinkedList<>();
-            attributes.add(createAttribute("icepatch", descriptor.icepatch));
-
-            if(descriptor.directories.isEmpty())
-            {
-                writer.writeElement("distrib", attributes);
-            }
-            else
-            {
-                writer.writeStartTag("distrib", attributes);
-                for(String p : descriptor.directories)
-                {
-                    writer.writeElement("directory", p);
-                }
-                writer.writeEndTag("distrib");
-            }
-        }
-    }
-
     static void writeObjects(String elt, XMLWriter writer, java.util.List<ObjectDescriptor> objects,
                              java.util.List<PropertyDescriptor> properties)
         throws java.io.IOException
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
index 22a8f990268..f87a848ae85 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
@@ -402,7 +402,6 @@ public class Coordinator
             _appMenu = new JMenu("Application");
             _appMenu.setEnabled(false);
             toolsMenu.add(_appMenu);
-            _appMenu.add(_patchApplication);
             _appMenu.add(_showApplicationDetails);
             _appMenu.add(_showLiveDeploymentFilters);
             _appMenu.addSeparator();
@@ -461,8 +460,6 @@ public class Coordinator
             _serverMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.ENABLE));
             _serverMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.DISABLE));
             _serverMenu.addSeparator();
-            _serverMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.PATCH_SERVER));
-            _serverMenu.addSeparator();
             _serverMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.WRITE_MESSAGE));
             _serverMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.RETRIEVE_ICE_LOG));
             _serverMenu.add(_liveActionsForMenu.get(com.zeroc.IceGridGUI.LiveDeployment.TreeNode.RETRIEVE_STDOUT));
@@ -1226,7 +1223,6 @@ public class Coordinator
         _logout.setEnabled(false);
         _showLiveDeploymentFilters.setEnabled(false);
         _openApplicationFromRegistry.setEnabled(false);
-        _patchApplication.setEnabled(false);
         _showApplicationDetails.setEnabled(false);
         _removeApplicationFromRegistry.setEnabled(false);
         _appMenu.setEnabled(false);
@@ -1702,7 +1698,6 @@ public class Coordinator
                 _logout.setEnabled(true);
                 _showLiveDeploymentFilters.setEnabled(true);
                 _openApplicationFromRegistry.setEnabled(true);
-                _patchApplication.setEnabled(true);
                 _showApplicationDetails.setEnabled(true);
                 _removeApplicationFromRegistry.setEnabled(true);
                 _appMenu.setEnabled(true);
@@ -2937,38 +2932,6 @@ public class Coordinator
                 }
             };
 
-        _patchApplication = new AbstractAction("Patch Distribution")
-            {
-                @Override
-                public void actionPerformed(ActionEvent e)
-                {
-                    Object[] applicationNames = _liveDeploymentRoot.getPatchableApplicationNames();
-
-                    if(applicationNames.length == 0)
-                    {
-                        JOptionPane.showMessageDialog(
-                            _mainFrame,
-                            "No application in this IceGrid registry can be patched",
-                            "No application",
-                            JOptionPane.INFORMATION_MESSAGE);
-                    }
-                    else
-                    {
-                        String appName = (String)JOptionPane.showInputDialog(
-                            _mainFrame, "Which application do you want to patch?",
-                            "Patch application",
-                            JOptionPane.QUESTION_MESSAGE, null,
-                            applicationNames, applicationNames[0]);
-
-                        if(appName != null)
-                        {
-                            _liveDeploymentRoot.patch(appName);
-                        }
-                    }
-                }
-            };
-        _patchApplication.setEnabled(false);
-
         _showApplicationDetails = new AbstractAction("Show details")
             {
                 @Override
@@ -3167,8 +3130,6 @@ public class Coordinator
                                                                 new java.util.HashMap<String, TemplateDescriptor>(),
                                                                 new java.util.HashMap<String, TemplateDescriptor>(),
                                                                 new java.util.HashMap<String, NodeDescriptor>(),
-                                                                new DistributionDescriptor(
-                                                                    "", new java.util.LinkedList<String>()),
                                                                 "",
                                                                 new java.util.HashMap<String, PropertySetDescriptor>());
         com.zeroc.IceGridGUI.Application.Root root = new com.zeroc.IceGridGUI.Application.Root(this, desc);
@@ -3832,7 +3793,6 @@ public class Coordinator
     private Action _forward;
     private Action _helpContents;
     private Action _about;
-    private Action _patchApplication;
     private Action _showApplicationDetails;
     private Action _removeApplicationFromRegistry;
 
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java
index 5ab1f3e133e..5b8d4b353bb 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java
@@ -176,15 +176,6 @@ public class LiveActions
                 }
             };
 
-        _array[TreeNode.PATCH_SERVER] = new AbstractAction("Patch Distribution")
-            {
-                @Override
-                public void actionPerformed(ActionEvent e)
-                {
-                    _target.patchServer();
-                }
-            };
-
         _array[TreeNode.ADD_OBJECT] = new AbstractAction("Add Well-known Object")
             {
                 @Override
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java
index ab5657e81ee..c26e0c41039 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java
@@ -61,20 +61,6 @@ class RegistryEditor extends CommunicatorEditor
                 }
             };
 
-        final Action patch = new AbstractAction("Patch distribution")
-            {
-                @Override
-                public void actionPerformed(ActionEvent e)
-                {
-                    int selectedRow = _applications.getSelectedRow();
-                    if(selectedRow != -1)
-                    {
-                        String appName = (String)_applications.getValueAt(selectedRow, 0);
-                        ((Root)_target).patch(appName);
-                    }
-                }
-            };
-
         Action removeApplication = new AbstractAction("Remove from registry")
             {
                 @Override
@@ -109,8 +95,6 @@ class RegistryEditor extends CommunicatorEditor
         appPopup.add(openDefinition);
         appPopup.add(showDetails);
         appPopup.addSeparator();
-        appPopup.add(patch);
-        appPopup.addSeparator();
         appPopup.add(removeApplication);
 
         _applications.addMouseListener(new MouseAdapter()
@@ -148,7 +132,6 @@ class RegistryEditor extends CommunicatorEditor
                     {
                         String appName = (String)_applications.getValueAt(selectedRow, 0);
                         ApplicationDescriptor desc = ((Root)_target).getApplicationDescriptor(appName);
-                        patch.setEnabled(desc != null && desc.distrib.icepatch.length() > 0);
                         appPopup.show(_applications, e.getX(), e.getY());
                     }
                 }
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Root.java
index d413c4d4169..6a9ce88e726 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Root.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Root.java
@@ -239,21 +239,6 @@ public class Root extends Communicator
         return _infoMap.keySet().toArray();
     }
 
-    public Object[] getPatchableApplicationNames()
-    {
-        java.util.List<String> result = new java.util.ArrayList<>();
-
-        for(java.util.Map.Entry<String, ApplicationInfo> p : _infoMap.entrySet())
-        {
-            ApplicationInfo app = p.getValue();
-            if(app.descriptor.distrib.icepatch.length() > 0)
-            {
-                result.add(p.getKey());
-            }
-        }
-        return result.toArray();
-    }
-
     public java.util.SortedMap<String, String> getApplicationMap()
     {
         java.util.SortedMap<String, String> r = new java.util.TreeMap<>();
@@ -337,39 +322,6 @@ public class Root extends Communicator
         _editor = null;
     }
 
-    public void patch(final String applicationName)
-    {
-        int shutdown = JOptionPane.showConfirmDialog(
-            _coordinator.getMainFrame(),
-            "You are about to install or refresh your application distribution.\n"
-            + " Do you want shut down all servers affected by this update?",
-            "Patch Confirmation",
-            JOptionPane.YES_NO_CANCEL_OPTION);
-
-        if(shutdown == JOptionPane.CANCEL_OPTION)
-        {
-            return;
-        }
-
-        final String prefix = "Patching application '" + applicationName + "'...";
-        final String errorTitle = "Failed to patch '" + applicationName;
-
-        _coordinator.getStatusBar().setText(prefix);
-        try
-        {
-            final AdminPrx admin = _coordinator.getAdmin();
-            admin.patchApplicationAsync(applicationName, shutdown == JOptionPane.YES_OPTION).whenComplete(
-                (result, ex) ->
-                    {
-                        amiComplete(prefix, errorTitle, ex);
-                    });
-        }
-        catch(com.zeroc.Ice.LocalException ex)
-        {
-            failure(prefix, errorTitle, ex.toString());
-        }
-    }
-
     public void showApplicationDetails(String appName)
     {
         ApplicationInfo app = _infoMap.get(appName);
@@ -449,10 +401,6 @@ public class Root extends Communicator
         {
             appDesc.description = update.descriptor.description.value;
         }
-        if(update.descriptor.distrib != null)
-        {
-            appDesc.distrib = update.descriptor.distrib.value;
-        }
 
         appDesc.variables.keySet().removeAll(java.util.Arrays.asList(update.descriptor.removeVariables));
         appDesc.variables.putAll(update.descriptor.variables);
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java
index 0bc9900152c..6b8e4d46f13 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java
@@ -42,8 +42,6 @@ public class Server extends Communicator
             actions[RETRIEVE_STDERR] = true;
             actions[RETRIEVE_LOG_FILE] = _serverDescriptor.logs.length > 0;
 
-            actions[PATCH_SERVER] = !_serverDescriptor.distrib.icepatch.equals("");
-
             if(_state != ServerState.Inactive)
             {
                 Node node = (Node)_parent;
@@ -252,45 +250,6 @@ public class Server extends Communicator
         }
     }
 
-    @Override
-    public void patchServer()
-    {
-        String message = _serverDescriptor.applicationDistrib ?
-            "You are about to install or refresh your"
-            + " server distribution and your application distribution onto this node.\n"
-            + "Do you want shut down all servers affected by this update?" :
-            "You are about to install or refresh the distribution for this server.\n"
-            + "Do you want to shut down the server for this update?";
-
-        int shutdown = JOptionPane.showConfirmDialog(
-            getCoordinator().getMainFrame(),
-            message,
-            "Patch Confirmation",
-            JOptionPane.YES_NO_CANCEL_OPTION);
-
-        if(shutdown == JOptionPane.CANCEL_OPTION)
-        {
-            return;
-        }
-
-        final String prefix = "Patching server '" + _id + "'...";
-        final String errorTitle = "Failed to patch " + _id;
-
-        getCoordinator().getStatusBar().setText(prefix);
-        try
-        {
-            final AdminPrx admin = getCoordinator().getAdmin();
-            admin.patchServerAsync(_id, shutdown == JOptionPane.YES_OPTION).whenComplete((result, ex) ->
-                {
-                    amiComplete(prefix, errorTitle, ex);
-                });
-        }
-        catch(com.zeroc.Ice.LocalException ex)
-        {
-            failure(prefix, errorTitle, ex.toString());
-        }
-    }
-
     private void enableServer(boolean enable)
     {
         final String prefix = (enable ?  "Enabling" : "Disabling") + " server '" + _id + "'...";
@@ -335,8 +294,6 @@ public class Server extends Communicator
             _popup.add(la.get(ENABLE));
             _popup.add(la.get(DISABLE));
             _popup.addSeparator();
-            _popup.add(la.get(PATCH_SERVER));
-            _popup.addSeparator();
             _popup.add(la.get(WRITE_MESSAGE));
             _popup.add(la.get(RETRIEVE_ICE_LOG));
             _popup.add(la.get(RETRIEVE_STDOUT));
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServerEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServerEditor.java
index e94b5623391..fdb2da812dc 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServerEditor.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServerEditor.java
@@ -57,9 +57,6 @@ class ServerEditor extends CommunicatorEditor
         _user.setEditable(false);
 
         _allocatable.setEnabled(false);
-        _applicationDistrib.setEnabled(false);
-        _icepatch.setEditable(false);
-        _directories.setEditable(false);
 
         Action gotoApplication = new AbstractAction("", Utils.getIcon("/icons/16x16/goto.png"))
             {
@@ -145,21 +142,6 @@ class ServerEditor extends CommunicatorEditor
         _deactivationTimeout.setText(resolver.substitute(descriptor.deactivationTimeout));
 
         _allocatable.setSelected(descriptor.allocatable);
-
-        _applicationDistrib.setSelected(descriptor.applicationDistrib);
-        _icepatch.setText(resolver.substitute(resolver.substitute(descriptor.distrib.icepatch)));
-
-        r = Utils.stringify(descriptor.distrib.directories, stringifier, ", ");
-        _directories.setText(r.returnValue);
-
-        String toolTip = "<html>Include only these directories";
-
-        if(r.toolTip != null)
-        {
-            toolTip += ":<br>" + r.toolTip;
-        }
-        toolTip += "</html>";
-        _directories.setToolTipText(toolTip);
     }
 
     @Override
@@ -227,18 +209,6 @@ class ServerEditor extends CommunicatorEditor
         builder.nextLine();
         builder.append("", _allocatable);
         builder.nextLine();
-
-        JComponent c = builder.appendSeparator("Distribution");
-        c.setToolTipText("Files specific to this server");
-
-        builder.append("", _applicationDistrib);
-        builder.nextLine();
-        builder.append("IcePatch2 Proxy");
-        builder.append(_icepatch, 3);
-        builder.nextLine();
-        builder.append("Directories");
-        builder.append(_directories, 3);
-        builder.nextLine();
     }
 
     @Override
@@ -289,10 +259,6 @@ class ServerEditor extends CommunicatorEditor
     private TableField _envs = new TableField("Name", "Value");
 
     private JTextField _options = new JTextField(20);
-    private JCheckBox _applicationDistrib = new JCheckBox("Depends on the application distribution");
-
-    private JTextField _icepatch = new JTextField(20);
-    private JTextField _directories = new JTextField(20);
 
     private JToolBar _toolBar;
 }
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java
index f3ab3420331..4c16ddc358c 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java
@@ -50,19 +50,17 @@ public abstract class TreeNode extends TreeNodeBase
     public static final int SHUTDOWN_NODE = 16;
     public static final int SHUTDOWN_REGISTRY = 17;
 
-    public static final int PATCH_SERVER = 18;
+    public static final int ADD_OBJECT = 18;
 
-    public static final int ADD_OBJECT = 19;
+    public static final int OPEN_DEFINITION = 19;
 
-    public static final int OPEN_DEFINITION = 20;
+    public static final int ENABLE_METRICS_VIEW = 20;
+    public static final int DISABLE_METRICS_VIEW = 21;
 
-    public static final int ENABLE_METRICS_VIEW = 21;
-    public static final int DISABLE_METRICS_VIEW = 22;
+    public static final int START_ALL_SERVERS = 22;
+    public static final int STOP_ALL_SERVERS = 23;
 
-    public static final int START_ALL_SERVERS = 23;
-    public static final int STOP_ALL_SERVERS = 24;
-
-    public static final int ACTION_COUNT = 25;
+    public static final int ACTION_COUNT = 24;
 
     public boolean[] getAvailableActions()
     {
@@ -113,10 +111,6 @@ public abstract class TreeNode extends TreeNodeBase
     {
         assert false;
     }
-    public void patchServer()
-    {
-        assert false;
-    }
     public void addObject()
     {
         assert false;
@@ -188,21 +182,6 @@ public abstract class TreeNode extends TreeNodeBase
         {
             amiFailure(prefix, title, "This application was not registered with the IceGrid Registry");
         }
-        else if(e instanceof com.zeroc.IceGrid.PatchException)
-        {
-            com.zeroc.IceGrid.PatchException pe = (com.zeroc.IceGrid.PatchException)e;
-
-            String message = "";
-            for(String s : pe.reasons)
-            {
-                if(message.length() > 0)
-                {
-                    message += "\n";
-                }
-                message += s;
-            }
-            amiFailure(prefix, title, message);
-        }
         else if(e instanceof com.zeroc.IceGrid.NodeNotExistException)
         {
             com.zeroc.IceGrid.NodeNotExistException nnee = (com.zeroc.IceGrid.NodeNotExistException)e;
diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
deleted file mode 100644
index 692f8793286..00000000000
--- a/java/src/IcePatch2/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-project.ext.displayName = "IcePatch2"
-project.ext.moduleName = "com.zeroc.icepatch2"
-project.ext.description = "File distribution and patching for Ice"
-
-slice {
-    java {
-        args = "--checksum com.zeroc.IcePatch2.SliceChecksums"
-        files = fileTree(dir: "$project.ext.topSrcDir/slice/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
-    }
-}
-
-dependencies {
-    implementation project(':ice')
-}
-
-apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff --git a/java/src/IcePatch2/src/main/java/com/zeroc/IcePatch2/package-info.java b/java/src/IcePatch2/src/main/java/com/zeroc/IcePatch2/package-info.java
deleted file mode 100644
index 88bccd377bd..00000000000
--- a/java/src/IcePatch2/src/main/java/com/zeroc/IcePatch2/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-/**
- * APIs for clients of the IcePatch2 file patching service.
- **/
-package com.zeroc.IcePatch2;
diff --git a/java/src/IcePatch2/src/main/java/module-info.java b/java/src/IcePatch2/src/main/java/module-info.java
deleted file mode 100644
index 23cb28da5ff..00000000000
--- a/java/src/IcePatch2/src/main/java/module-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-module com.zeroc.icepatch2 {
-    exports com.zeroc.IcePatch2;
-
-    requires transitive com.zeroc.ice;
-}