From 2980bfeddc7ad06795a241fbb103f1ba4f673aaf Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 21 Jun 2022 11:58:39 +0100
Subject: [PATCH 1/7] remove ice from version parsing

---
 components/antlib/scripts/parse_version | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/antlib/scripts/parse_version b/components/antlib/scripts/parse_version
index 76f2cab9929..13c72665105 100755
--- a/components/antlib/scripts/parse_version
+++ b/components/antlib/scripts/parse_version
@@ -82,8 +82,7 @@ def snapshot_logic(omero_version):
     if m:
         # Non-tag version
         base = incr_version(m.group("BASE"))
-        omero_version = "%s%s-SNAPSHOT" % (
-            base, m.group("ICE"))
+        omero_version = "%s-SNAPSHOT" % base
     else:
         return omero_version
     return omero_version

From ca64c2d57ee28a3c52b22f4d42dcaaab7fecb36b Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 21 Jun 2022 12:28:48 +0100
Subject: [PATCH 2/7] remove slice2java

---
 build.xml                               | 28 +------------------------
 components/antlib/resources/global.xml  | 12 -----------
 components/antlib/resources/version.xml |  4 ++--
 3 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/build.xml b/build.xml
index 359e18a9dc6..d5f3c9503b3 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
     <property name="import.dir" value="${basedir}/components/antlib/resources"/>
     <import file="${import.dir}/global.xml"/>
 
-    <target name="init" depends="check-ivy,check-scons,check-ice">
+    <target name="init" depends="check-ivy,check-scons">
     </target>
 
     <target name="check-git">
@@ -95,32 +95,6 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
         <unzip src="${lib.dir}/repository/scons-local-2.1.0.zip" dest="target/scons"/>
     </target>
 
-    <target name="check-ice" description="Checks Ice versioning">
-        <!-- Checking the slice2* version before continuing. See #1185 -->
-        <exec outputproperty="executable.ice.version" executable="${ice.slice2java}">
-            <arg value="--version"/>
-        </exec>
-        <if>
-            <not>
-                <or>
-                    <matches pattern="^${ice.compatibility}" string="${executable.ice.version}"/>
-                    <matches pattern="^${ice.compatibility}" string="auto"/>
-                </or>
-            </not>
-            <then><fail>WRONG ICE VERSION!
-
-                slice2java (${ice.slice2java}) version = ${executable.ice.version}
-                Expected version = ${ice.compatibility}
-
-                If you would like to configure which Ice to use, set
-                ice.compatibility=ice_version in etc/local.properties
-                or on the command-line, e.g.:
-
-                  ./build.py -Dice.compatibility=3.6
-
-            </fail></then>
-        </if>
-    </target>
 
     <target name="build-default" description="Default build calls build" depends="build"/>
     <target name="build" description="Build all components" depends="init">
diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
index e5ac9e84f47..96e6790a4c8 100644
--- a/components/antlib/resources/global.xml
+++ b/components/antlib/resources/global.xml
@@ -289,18 +289,6 @@
             <arg value="--version"/>
         </exec>
 
-        <!-- Checking ice compatibility and choose the proper version -->
-        <if><not><equals arg1="${slice2java.result}" arg2="0"/></not>
-            <then>
-                <fail> Cannot find slice2java!
-
-                    *******************************************************
-                    Ice is not properly installed. Cannot find slice2java
-                    *******************************************************
-                </fail>
-            </then>
-        </if>
-
         <propertyregex property="executable.ice.shortversion" input="${executable.ice.version}" select="\1.\2">
             <regexp pattern="([0-9]*)\.([0-9]*)\.([0-9]*).*"/>
         </propertyregex>
diff --git a/components/antlib/resources/version.xml b/components/antlib/resources/version.xml
index d38f3fe5025..f87c4be3e7b 100644
--- a/components/antlib/resources/version.xml
+++ b/components/antlib/resources/version.xml
@@ -82,7 +82,7 @@
                 outputproperty = "omero.version"
                 failonerror = "true">
                 <arg value = "parse_version" />
-                <arg value = "${omero.plainversion}-ice${versions.ice_lib}"/>
+                <arg value = "${omero.plainversion}"/>
             </exec>
             <property name="omero.version.source" value="git"/>
             <property name="omero.plainversion.source" value="git"/>
@@ -129,7 +129,7 @@
             <property name="omero.vcs.date_unix" value="UNKNOWN"/>
 
             <!-- And compose omero.version from those -->
-            <property name="omero.version" value="${omero.plainversion}-ice${versions.ice_lib}"/>
+            <property name="omero.version" value="${omero.plainversion}"/>
 
             <property name="omero.plainversion.source" value="ant"/>
             <property name="omero.shortversion.source" value="ant"/>

From f45d67a73fce1d5f9364452ec382be4dedba4b94 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 21 Jun 2022 15:25:58 +0100
Subject: [PATCH 3/7] remove slice2java

---
 components/antlib/resources/global.xml | 55 +++-----------------------
 1 file changed, 5 insertions(+), 50 deletions(-)

diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
index 96e6790a4c8..f3405e71a62 100644
--- a/components/antlib/resources/global.xml
+++ b/components/antlib/resources/global.xml
@@ -221,9 +221,6 @@
         <condition property="ice.home" value="${env.ICE_HOME}">
             <isset property="env.ICE_HOME"/>
         </condition>
-        <condition property="ice.slice2java" value="${env.SLICE2JAVA}">
-            <isset property="env.SLICE2JAVA"/>
-        </condition>
         <condition property="ice.slice2py" value="${env.SLICE2PY}">
             <isset property="env.SLICE2PY"/>
         </condition>
@@ -263,11 +260,6 @@
         </condition>
         <property name="ice.home" value=""/>
 
-        <condition property="ice.slice2java" value="${ice.home}/bin/slice2java">
-            <available file="${ice.home}/bin/slice2java"/>
-        </condition>
-        <property name="ice.slice2java" value="slice2java"/>
-
         <condition property="ice.slice2py" value="${ice.home}/bin/slice2py">
             <available file="${ice.home}/bin/slice2py"/>
         </condition>
@@ -284,46 +276,11 @@
         <property name="ice.slice2html" value="slice2html"/>
 
         <!-- Checking the slice2* version before continuing. See #1185 -->
-        <exec outputproperty="executable.ice.version" executable="${ice.slice2java}"
-            failifexecutionfails="false" failonerror="false" resultproperty="slice2java.result">
-            <arg value="--version"/>
-        </exec>
-
-        <propertyregex property="executable.ice.shortversion" input="${executable.ice.version}" select="\1.\2">
-            <regexp pattern="([0-9]*)\.([0-9]*)\.([0-9]*).*"/>
-        </propertyregex>
-
-        <if><equals arg1="auto" arg2="${ice.compatibility}"/>
-            <then>
-                <if><matches string="${executable.ice.version}" pattern="^3[.]6"/>
-                    <then>
-                        <property name="versions.ice" value="${versions.ice36}"/>
-                        <property name="versions.ice_lib" value="${versions.ice36_lib}"/>
-                        <property name="versions.icedb" value="${versions.icedb36}"/>
-                        <property name="versions.omeromock" value="${versions.omeromock36}"/>
-                        <property name="versions.omeroshares" value="${versions.omeroshares36}"/>
-                    </then>
-                </if>
-            </then>
-            <elseif>
-                <equals arg1="3.6" arg2="${ice.compatibility}"/>
-                <then>
-                    <property name="versions.ice" value="${versions.ice36}"/>
-                    <property name="versions.ice_lib" value="${versions.ice36_lib}"/>
-                    <property name="versions.icedb" value="${versions.icedb36}"/>
-                    <property name="versions.omeromock" value="${versions.omeromock36}"/>
-                    <property name="versions.omeroshares" value="${versions.omeroshares36}"/>
-                </then>
-            </elseif>
-            <else>
-                <fail> Bad configuration!
-
-                    *******************************************************
-                    Unknown Ice compatibility setting: ${ice.compatibility}
-                    *******************************************************
-                </fail>
-            </else>
-        </if>
+        <property name="versions.ice" value="${versions.ice36}"/>
+        <property name="versions.ice_lib" value="${versions.ice36_lib}"/>
+        <property name="versions.icedb" value="${versions.icedb36}"/>
+        <property name="versions.omeromock" value="${versions.omeromock36}"/>
+        <property name="versions.omeroshares" value="${versions.omeroshares36}"/>
 
         <condition property="ice.slicepath" value="${ice.home}/slice">
             <available file="${ice.home}/slice" type="dir"/>
@@ -499,7 +456,6 @@
                 <property name="env.ARCH" value="detect"/>
                 <property name="env.RELEASE" value="debug"/>
                 <echo>Building with ICE_HOME=${ice.home}</echo>
-                <echo>Building with SLICE2JAVA=${ice.slice2java}</echo>
                 <echo>Building with SLICE2PY=${ice.slice2py}</echo>
                 <echo>Building with SLICE2CPP=${ice.slice2cpp}</echo>
                 <echo>Building with SLICE2HTML=${ice.slice2html}</echo>
@@ -507,7 +463,6 @@
                 <exec executable="python" dir="@{dir}" failonerror="@{failonerror}">
                     <env key="PYTHONPATH" value="@{pythonpath}"/>
                     <env key="ICE_HOME" value="${ice.home}"/>
-                    <env key="SLICE2JAVA" value="${ice.slice2java}"/>
                     <env key="SLICE2PY" value="${ice.slice2py}"/>
                     <env key="SLICE2CPP" value="${ice.slice2cpp}"/>
                     <env key="SLICE2HTML" value="${ice.slice2html}"/>

From 59562c907270ea15684029cbf0496e2e62659adb Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Wed, 22 Jun 2022 09:57:20 +0100
Subject: [PATCH 4/7] do not drop ice36 from name for now

---
 components/antlib/resources/version.xml | 4 ++--
 components/antlib/scripts/parse_version | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/antlib/resources/version.xml b/components/antlib/resources/version.xml
index f87c4be3e7b..d38f3fe5025 100644
--- a/components/antlib/resources/version.xml
+++ b/components/antlib/resources/version.xml
@@ -82,7 +82,7 @@
                 outputproperty = "omero.version"
                 failonerror = "true">
                 <arg value = "parse_version" />
-                <arg value = "${omero.plainversion}"/>
+                <arg value = "${omero.plainversion}-ice${versions.ice_lib}"/>
             </exec>
             <property name="omero.version.source" value="git"/>
             <property name="omero.plainversion.source" value="git"/>
@@ -129,7 +129,7 @@
             <property name="omero.vcs.date_unix" value="UNKNOWN"/>
 
             <!-- And compose omero.version from those -->
-            <property name="omero.version" value="${omero.plainversion}"/>
+            <property name="omero.version" value="${omero.plainversion}-ice${versions.ice_lib}"/>
 
             <property name="omero.plainversion.source" value="ant"/>
             <property name="omero.shortversion.source" value="ant"/>
diff --git a/components/antlib/scripts/parse_version b/components/antlib/scripts/parse_version
index 13c72665105..a4ac0fac8c1 100755
--- a/components/antlib/scripts/parse_version
+++ b/components/antlib/scripts/parse_version
@@ -82,7 +82,8 @@ def snapshot_logic(omero_version):
     if m:
         # Non-tag version
         base = incr_version(m.group("BASE"))
-        omero_version = "%s-SNAPSHOT" % base
+        omero_version = "%s-SNAPSHOT" % (
+            base, m.group("ICE"))
     else:
         return omero_version
     return omero_version

From 4994dbca9807b3c6b988484e5e31b97d34d6ab82 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Wed, 22 Jun 2022 10:19:19 +0100
Subject: [PATCH 5/7] remove slice2py

---
 components/antlib/resources/global.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
index f3405e71a62..07b8f604932 100644
--- a/components/antlib/resources/global.xml
+++ b/components/antlib/resources/global.xml
@@ -221,9 +221,6 @@
         <condition property="ice.home" value="${env.ICE_HOME}">
             <isset property="env.ICE_HOME"/>
         </condition>
-        <condition property="ice.slice2py" value="${env.SLICE2PY}">
-            <isset property="env.SLICE2PY"/>
-        </condition>
         <condition property="ice.slice2cpp" value="${env.SLICE2CPP}">
             <isset property="env.SLICE2CPP"/>
         </condition>
@@ -260,11 +257,6 @@
         </condition>
         <property name="ice.home" value=""/>
 
-        <condition property="ice.slice2py" value="${ice.home}/bin/slice2py">
-            <available file="${ice.home}/bin/slice2py"/>
-        </condition>
-        <property name="ice.slice2py" value="slice2py"/>
-
         <condition property="ice.slice2cpp" value="${ice.home}/bin/slice2cpp">
             <available file="${ice.home}/bin/slice2cpp"/>
         </condition>
@@ -456,14 +448,12 @@
                 <property name="env.ARCH" value="detect"/>
                 <property name="env.RELEASE" value="debug"/>
                 <echo>Building with ICE_HOME=${ice.home}</echo>
-                <echo>Building with SLICE2PY=${ice.slice2py}</echo>
                 <echo>Building with SLICE2CPP=${ice.slice2cpp}</echo>
                 <echo>Building with SLICE2HTML=${ice.slice2html}</echo>
                 <echo>Building with SLICEPATH=${ice.slicepath}</echo>
                 <exec executable="python" dir="@{dir}" failonerror="@{failonerror}">
                     <env key="PYTHONPATH" value="@{pythonpath}"/>
                     <env key="ICE_HOME" value="${ice.home}"/>
-                    <env key="SLICE2PY" value="${ice.slice2py}"/>
                     <env key="SLICE2CPP" value="${ice.slice2cpp}"/>
                     <env key="SLICE2HTML" value="${ice.slice2html}"/>
                     <env key="SLICEPATH" value="${ice.slicepath}"/>

From b96a8b1726c5a8e2ea18bb1bf405750bc000ea7b Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Wed, 22 Jun 2022 10:27:55 +0100
Subject: [PATCH 6/7] remove installation of ice action

---
 .github/workflows/source_build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/source_build.yml b/.github/workflows/source_build.yml
index 4f97849a152..39c05018961 100644
--- a/.github/workflows/source_build.yml
+++ b/.github/workflows/source_build.yml
@@ -11,7 +11,6 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - uses: ome/action-ice@v1
       - name: Install and run flake8
         run: |
           pip install flake8

From 134d86a4221eb34170c5862ed894907516cfd65f Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 23 Jun 2022 20:55:08 +0100
Subject: [PATCH 7/7] insert ice version

---
 components/antlib/scripts/parse_version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/antlib/scripts/parse_version b/components/antlib/scripts/parse_version
index a4ac0fac8c1..76f2cab9929 100755
--- a/components/antlib/scripts/parse_version
+++ b/components/antlib/scripts/parse_version
@@ -82,7 +82,7 @@ def snapshot_logic(omero_version):
     if m:
         # Non-tag version
         base = incr_version(m.group("BASE"))
-        omero_version = "%s-SNAPSHOT" % (
+        omero_version = "%s%s-SNAPSHOT" % (
             base, m.group("ICE"))
     else:
         return omero_version