From cf26bb89e6b87afcac6bdaa07fb64fdee860b9b3 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Fri, 14 Jul 2023 18:26:01 -0400
Subject: [PATCH] Turn off win zip and jar creation and upload in the maven
 build

---
 .github/scripts/sign-exe-in-zip-file.sh       |  6 +-
 .../gh-hosted-eclipse-distro-build.yml        |  5 +-
 .../self-hosted-eclipse-distro-build.yml      | 31 +++++++-
 eclipse-distribution/local-build.sh           |  2 +-
 .../pom.xml                                   | 77 +------------------
 .../pom.xml                                   | 76 ------------------
 .../pom.xml                                   | 77 +------------------
 7 files changed, 38 insertions(+), 236 deletions(-)

diff --git a/.github/scripts/sign-exe-in-zip-file.sh b/.github/scripts/sign-exe-in-zip-file.sh
index 0155b452b..80fda872f 100755
--- a/.github/scripts/sign-exe-in-zip-file.sh
+++ b/.github/scripts/sign-exe-in-zip-file.sh
@@ -1,6 +1,8 @@
 set -e
 
 file=$1
+sign_script=$2
+self_extr_jar=$3
 filename="$(basename -- $file)"
 
 workdir=`pwd`
@@ -15,13 +17,13 @@ echo "Successfully extracted ${filename}"
 sts_folder=`find ./${destination_folder_name} -maxdepth 1 -type d -name 'sts-*' -print -quit`
 echo "Found STS distro folder: ${sts_folder}"
 echo "About to sign win exe file: ${sts_folder}/SpringToolSuite4.exe"
-${workdir}/.github/scripts/sign-exe.sh ${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe
+$sign_script ${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe
 echo "Adding to zip contents of a folder ${destination_folder_name}"
 cd ${destination_folder_name}
 zip -r -q ../$file .
 cd ..
 echo "Successfully zipped ${destination_folder_name} into ${file}"
-java -jar ${workdir}/.github/scripts/self-extracting-jar-creator.jar $file
+java -jar $self_extr_jar $file
 echo "Remove temporary ${destination_folder_name}"
 rm -rf ./${destination_folder_name}
 
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 115965937..703f148c3 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -112,11 +112,10 @@ jobs:
           SSH_KEY: ~/.ssh/id_rsa
           SSH_USER: signer
         run: |
-          workdir=`pwd`
-          files=`ls *.zip`
+          files=`ls spring-tool-suite-4*win*.zip`
           for file in $files
           do
-            ./.github/scripts/sign-exe-in-zip-file.sh $file
+            ${{ github.workspace }}/.github/scripts/sign-exe-in-zip-file.sh $file ${{ github.workspace }}/.github/scripts/sign-exe.sh ${{ github.workspace }}/.github/scripts/self-extracting-jar-creator.jar
           done
       - uses: actions/download-artifact@cbed621e49e4c01b044d60f6c80ea4ed6328b281
         with:
diff --git a/.github/workflows/self-hosted-eclipse-distro-build.yml b/.github/workflows/self-hosted-eclipse-distro-build.yml
index 978bba8fc..96ade68e0 100644
--- a/.github/workflows/self-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/self-hosted-eclipse-distro-build.yml
@@ -28,6 +28,7 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
           sparse-checkout: |
+            .github
             eclipse-distribution
             eclipse-extensions
       - name: Set up JDK 17
@@ -61,6 +62,32 @@ jobs:
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
         run: |
-          ls
           cd eclipse-distribution
-          ./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -Pgitactions -Pgpg.sign -Dsigning.skip=true -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Ds3service.https-only=true -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dskip.osx.signing=false  -Dskip.win.signing=false -Dskip.osx.notarizing=false -Dtycho.equinox.resolver.uses=true
\ No newline at end of file
+          ./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -Pgitactions -Pgpg.sign -Dsigning.skip=true -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Ds3service.https-only=true -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dskip.osx.signing=false  -Dskip.win.signing=false -Dskip.osx.notarizing=false -Dtycho.equinox.resolver.uses=true
+      - name: Sign EXE within zip files
+        id: sign
+        env:
+          SSH_KEY: ~/.ssh/id_rsa
+          SSH_USER: signer
+        run: |
+          cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products
+          files=`ls spring-tool-suite-4*win*.zip`
+          for file in $files
+          do
+            ${{ github.workspace }}/.github/scripts/sign-exe-in-zip-file.sh $file ${{ github.workspace }}/.github/scripts/sign-exe.sh ${{ github.workspace }}/.github/scripts/self-extracting-jar-creator.jar
+          done
+      - name: Update S3
+        id: update-s3
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
+        run: |
+          dist_path=`cat ./eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/s3-dist-path.txt`
+          cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products
+          echo "Processing S3 update..."
+          ls spring-tool-suite-4*win*.zip*
+          ls spring-tool-suite-4*win*.self-extracting.jar*
+          echo "Removing old win zip and self extracting jar files from s3..."
+          aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar* --exclude "*/*""
+          echo "Uploading new win zip and self extracting jar files to s3..."
+          aws s3 cp . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" --acl public-read --no-progress        
diff --git a/eclipse-distribution/local-build.sh b/eclipse-distribution/local-build.sh
index 787abe5f3..6fb3b03d2 100755
--- a/eclipse-distribution/local-build.sh
+++ b/eclipse-distribution/local-build.sh
@@ -1,2 +1,2 @@
-./mvnw clean package -Pe428 -Psnapshot -Dsigning.skip=true -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.osx.signing=true -Dskip.win.signing=true -Dskip.osx.notarizing=true
+./mvnw clean install -Pe428 -Psnapshot -Dsigning.skip=true -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.osx.signing=true -Dskip.win.signing=true -Dskip.osx.notarizing=true
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml
index a5c9ad0c8..807f7beb0 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml
@@ -327,22 +327,6 @@
 						</configuration>
 					</execution>
 
-					<execution>
-	                    <id>generate-self-extracting-jar</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-					        <executable>java</executable>
-							<arguments>
-								<argument>-jar</argument>
-								<argument>${project.build.directory}/../../common/self-extracting-jar-creator.jar</argument>
-								<argument>${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip</argument>
-							</arguments>
-						</configuration>
-					</execution>
-
 				</executions>
 			</plugin>
 
@@ -352,48 +336,6 @@
 				<version>1.7</version>
 				<executions>
 
-					<!-- win exe signing reguires the npm module osslsigncode to be installed on the build machine and the corresponding keys to be around in PKCS#12 format -->
-					<execution>
-						<id>win-exe-signing</id>
-						<phase>package</phase>
-						<configuration>
-							<skip>${skip.win.signing}</skip>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
-								<exec executable="${project.basedir}/../scripts/sign-exe.sh" failonerror="true">
-									<env key="SSH_USER" value="${vm-signing.ssh.user}" />
-									<env key="SSH_KEY" value="${vm-signing.ssh.key}" />
-									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
-									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
-								</exec>
-
-<!--								<exec executable="osslsigncode" failonerror="true">-->
-<!--									<arg value="sign"/>-->
-<!--									<arg value="-pkcs12"/>-->
-<!--									<arg value="${env.WIN_KEY_LOCATION}"/>-->
-<!--									<arg value="-pass"/>-->
-<!--									<arg value="${env.bamboo_vault_signing_passphrase}"/>-->
-<!--									<arg value="-n"/>-->
-<!--									<arg value="Spring Tools 4"/>-->
-<!--								    <arg value="-i"/>-->
-<!--								    <arg value="https://spring.io"/>-->
-<!--								    <arg value="-t"/>-->
-<!--								    <arg value="http://timestamp.digicert.com"/>-->
-<!--									<arg value="-in"/>-->
-<!--									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
-<!--									<arg value="-out"/>-->
-<!--								    <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
-<!--								</exec>-->
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
 					<!-- macos code signing requires the build to run on a macOS machine with Xcode installed, including the appropriate Apple Developer certificates for code signing -->
 					<execution>
 						<id>osx-app-signing</id>
@@ -444,6 +386,7 @@
 						<id>osx-dmg-creation</id>
 						<phase>verify</phase>
 						<configuration>
+							<skip>${skip.osx.notarizing}</skip>
 							<target>
 
 								<exec executable="/usr/local/bin/appdmg" failonerror="true">
@@ -598,23 +541,11 @@
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA-256" fileext=".sha256" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="SHA-256" fileext=".sha256" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="MD5" fileext=".md5" />
 
 								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
 
 									<delete bucketName="${dist.bucket}">
 										<fileset dir="${dist.path.product}">
-											<include name="spring-tool-suite-4*.zip" />
-											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha1" />
-											<include name="spring-tool-suite-4*.zip.sha256" />
-											<include name="spring-tool-suite-4*.jar" />
-											<include name="spring-tool-suite-4*.jar.md5" />
-											<include name="spring-tool-suite-4*.jar.sha1" />
-											<include name="spring-tool-suite-4*.jar.sha256" />
 											<include name="spring-tool-suite-4*.tar.gz" />
 											<include name="spring-tool-suite-4*.tar.gz.md5" />
 											<include name="spring-tool-suite-4*.tar.gz.sha1" />
@@ -629,12 +560,6 @@
 									<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
 										publicRead="true">
 										<fileset dir="${project.build.directory}/products">
-											<include name="spring-tool-suite-4*.zip" />
-											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha256" />
-											<include name="spring-tool-suite-4*.jar" />
-											<include name="spring-tool-suite-4*.jar.md5" />
-											<include name="spring-tool-suite-4*.jar.sha256" />
 											<include name="spring-tool-suite-4*.tar.gz" />
 											<include name="spring-tool-suite-4*.tar.gz.md5" />
 											<include name="spring-tool-suite-4*.tar.gz.sha256" />
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
index 965534ce2..bc17247e8 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -315,22 +315,6 @@
 						</configuration>
 					</execution>
 
-					<execution>
-	                    <id>generate-self-extracting-jar</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-					        <executable>java</executable>
-							<arguments>
-								<argument>-jar</argument>
-								<argument>${project.build.directory}/../../common/self-extracting-jar-creator.jar</argument>
-								<argument>${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip</argument>
-							</arguments>
-						</configuration>
-					</execution>
-
 				</executions>
 			</plugin>
 
@@ -340,48 +324,6 @@
 				<version>1.7</version>
 				<executions>
 
-					<!-- win exe signing reguires the npm module osslsigncode to be installed on the build machine and the corresponding keys to be around in PKCS#12 format -->
-					<execution>
-						<id>win-exe-signing</id>
-						<phase>package</phase>
-						<configuration>
-							<skip>${skip.win.signing}</skip>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
-								<exec executable="${project.basedir}/../scripts/sign-exe.sh" failonerror="true">
-									<env key="SSH_USER" value="${vm-signing.ssh.user}" />
-									<env key="SSH_KEY" value="${vm-signing.ssh.key}" />
-									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
-									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
-								</exec>
-
-<!--								<exec executable="osslsigncode" failonerror="true">-->
-<!--									<arg value="sign"/>-->
-<!--									<arg value="-pkcs12"/>-->
-<!--									<arg value="${env.WIN_KEY_LOCATION}"/>-->
-<!--									<arg value="-pass"/>-->
-<!--									<arg value="${env.bamboo_vault_signing_passphrase}"/>-->
-<!--									<arg value="-n"/>-->
-<!--									<arg value="Spring Tools 4"/>-->
-<!--								    <arg value="-i"/>-->
-<!--								    <arg value="https://spring.io"/>-->
-<!--								    <arg value="-t"/>-->
-<!--								    <arg value="http://timestamp.digicert.com"/>-->
-<!--									<arg value="-in"/>-->
-<!--									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
-<!--									<arg value="-out"/>-->
-<!--								    <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
-<!--								</exec>-->
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
 					<!-- macos code signing requires the build to run on a macOS machine with Xcode installed, including the appropriate Apple Developer certificates for code signing -->
 					<execution>
 						<id>osx-app-signing</id>
@@ -595,23 +537,11 @@
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA-256" fileext=".sha256" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="SHA-256" fileext=".sha256" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="MD5" fileext=".md5" />
 
 								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
 
 									<delete bucketName="${dist.bucket}">
 										<fileset dir="${dist.path.product}">
-											<include name="spring-tool-suite-4*.zip" />
-											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha1" />
-											<include name="spring-tool-suite-4*.zip.sha256" />
-											<include name="spring-tool-suite-4*.jar" />
-											<include name="spring-tool-suite-4*.jar.md5" />
-											<include name="spring-tool-suite-4*.jar.sha1" />
-											<include name="spring-tool-suite-4*.jar.sha256" />
 											<include name="spring-tool-suite-4*.tar.gz" />
 											<include name="spring-tool-suite-4*.tar.gz.md5" />
 											<include name="spring-tool-suite-4*.tar.gz.sha1" />
@@ -626,12 +556,6 @@
 									<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
 										publicRead="true">
 										<fileset dir="${project.build.directory}/products">
-											<include name="spring-tool-suite-4*.zip" />
-											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha256" />
-											<include name="spring-tool-suite-4*.jar" />
-											<include name="spring-tool-suite-4*.jar.md5" />
-											<include name="spring-tool-suite-4*.jar.sha256" />
 											<include name="spring-tool-suite-4*.tar.gz" />
 											<include name="spring-tool-suite-4*.tar.gz.md5" />
 											<include name="spring-tool-suite-4*.tar.gz.sha256" />
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
index c496888a4..0bf02d99d 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
@@ -327,22 +327,6 @@
 						</configuration>
 					</execution>
 
-					<execution>
-	                    <id>generate-self-extracting-jar</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-					        <executable>java</executable>
-							<arguments>
-								<argument>-jar</argument>
-								<argument>${project.build.directory}/../../common/self-extracting-jar-creator.jar</argument>
-								<argument>${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip</argument>
-							</arguments>
-						</configuration>
-					</execution>
-
 				</executions>
 			</plugin>
 
@@ -352,48 +336,6 @@
 				<version>1.7</version>
 				<executions>
 
-					<!-- win exe signing reguires the npm module osslsigncode to be installed on the build machine and the corresponding keys to be around in PKCS#12 format -->
-					<execution>
-						<id>win-exe-signing</id>
-						<phase>package</phase>
-						<configuration>
-							<skip>${skip.win.signing}</skip>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
-								<exec executable="${project.basedir}/../scripts/sign-exe.sh" failonerror="true">
-									<env key="SSH_USER" value="${vm-signing.ssh.user}" />
-									<env key="SSH_KEY" value="${vm-signing.ssh.key}" />
-									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
-									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
-								</exec>
-
-<!--								<exec executable="osslsigncode" failonerror="true">-->
-<!--									<arg value="sign"/>-->
-<!--									<arg value="-pkcs12"/>-->
-<!--									<arg value="${env.WIN_KEY_LOCATION}"/>-->
-<!--									<arg value="-pass"/>-->
-<!--									<arg value="${env.bamboo_vault_signing_passphrase}"/>-->
-<!--									<arg value="-n"/>-->
-<!--									<arg value="Spring Tools 4"/>-->
-<!--								    <arg value="-i"/>-->
-<!--								    <arg value="https://spring.io"/>-->
-<!--								    <arg value="-t"/>-->
-<!--								    <arg value="http://timestamp.digicert.com"/>-->
-<!--									<arg value="-in"/>-->
-<!--									<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
-<!--									<arg value="-out"/>-->
-<!--								    <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
-<!--								</exec>-->
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-
 					<!-- macos code signing requires the build to run on a macOS machine with Xcode installed, including the appropriate Apple Developer certificates for code signing -->
 					<execution>
 						<id>osx-app-signing</id>
@@ -446,6 +388,7 @@
 						<id>osx-dmg-creation</id>
 						<phase>verify</phase>
 						<configuration>
+							<skip>${skip.osx.notarizing}</skip>
 							<target>
 
 								<exec executable="/usr/local/bin/appdmg" failonerror="true">
@@ -606,23 +549,11 @@
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
 								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA-256" fileext=".sha256" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="SHA-256" fileext=".sha256" />
-								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="MD5" fileext=".md5" />
 
 								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
 
 									<delete bucketName="${dist.bucket}">
 										<fileset dir="${dist.path.product}">
-											<include name="spring-tool-suite-4*.zip" />
-											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha1" />
-											<include name="spring-tool-suite-4*.zip.sha256" />
-											<include name="spring-tool-suite-4*.jar" />
-											<include name="spring-tool-suite-4*.jar.md5" />
-											<include name="spring-tool-suite-4*.jar.sha1" />
-											<include name="spring-tool-suite-4*.jar.sha256" />
 											<include name="spring-tool-suite-4*.tar.gz" />
 											<include name="spring-tool-suite-4*.tar.gz.md5" />
 											<include name="spring-tool-suite-4*.tar.gz.sha1" />
@@ -637,12 +568,6 @@
 									<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
 										publicRead="true">
 										<fileset dir="${project.build.directory}/products">
-											<include name="spring-tool-suite-4*.zip" />
-											<include name="spring-tool-suite-4*.zip.md5" />
-											<include name="spring-tool-suite-4*.zip.sha256" />
-											<include name="spring-tool-suite-4*.jar" />
-											<include name="spring-tool-suite-4*.jar.md5" />
-											<include name="spring-tool-suite-4*.jar.sha256" />
 											<include name="spring-tool-suite-4*.tar.gz" />
 											<include name="spring-tool-suite-4*.tar.gz.md5" />
 											<include name="spring-tool-suite-4*.tar.gz.sha256" />