GHA: remove distro files processing from maven poms

This commit is contained in:
aboyko
2023-07-20 01:04:39 -04:00
parent 2971b205e1
commit d8ead7aa62
5 changed files with 12 additions and 748 deletions

View File

@@ -11,7 +11,7 @@ on:
jobs:
eclipse-language-servers-build:
runs-on: ubuntu-latest
runs-on: macos-latest-xl
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
with:

View File

@@ -70,7 +70,7 @@ jobs:
echo "Removing old Linux .tar.gz files from s3..."
aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*"
echo "Uploading new Linux .ta.gz files to s3..."
aws s3 mv . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*" --acl public-read --no-progress
aws s3 cp . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*" --acl public-read --no-progress
- name: Upload Build Artifacts for Signing
env:
AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}

View File

@@ -336,248 +336,6 @@
<version>1.7</version>
<executions>
<!-- 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>
<phase>package</phase>
<configuration>
<skip>${skip.osx.signing}</skip>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--entitlements"/>
<arg value="${project.build.directory}/../entitlements.plist"/>
<arg value="--options=runtime"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
</exec>
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--entitlements"/>
<arg value="${project.build.directory}/../entitlements.plist"/>
<arg value="--options=runtime"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app"/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!-- the creation of the DMG file is based on appdmg: https://www.npmjs.com/package/appdmg -->
<execution>
<id>osx-dmg-creation</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.notarizing}</skip>
<target>
<exec executable="/usr/local/bin/appdmg" failonerror="true">
<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-x86.json"/>
<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
</exec>
<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
<exec executable="/usr/local/bin/appdmg" failonerror="true">
<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-aarch64.json"/>
<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg"/>
</exec>
<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.tar.gz"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>osx-dmg-signing</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.signing}</skip>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${dmgName}"/>
</exec>
<property name="dmgName-aarch" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${dmgName-aarch}"/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!-- the notarizing of the DMG file needs this service running somewhere: https://github.com/eclipse-cbi/macos-notarization-service -->
<execution>
<id>osx-dmg-notarizing</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.notarizing}</skip>
<target>
<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
<property name="dmgName-aarch64" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="store-credentials" />
<arg value="notarize-app-dmg-profile" />
<arg value="--apple-id" />
<arg value="${env.AC_USERNAME}" />
<arg value="--team-id" />
<arg value="${env.APPLE_TEAM_ID}" />
<arg value="--password" />
<arg value="${env.AC_PASSWORD}" />
</exec>
<parallel failonany="true">
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="submit" />
<arg value="${dmgName}" />
<arg value="--keychain-profile" />
<arg value="notarize-app-dmg-profile" />
<arg value="--wait" />
</exec>
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="submit" />
<arg value="${dmgName-aarch64}" />
<arg value="--keychain-profile" />
<arg value="notarize-app-dmg-profile" />
<arg value="--wait" />
</exec>
</parallel>
<parallel failonany="true">
<exec executable="xcrun" failonerror="true">
<arg value="stapler" />
<arg value="staple" />
<arg value="${dmgName}" />
</exec>
<exec executable="xcrun" failonerror="true">
<arg value="stapler" />
<arg value="staple" />
<arg value="${dmgName-aarch64}" />
</exec>
</parallel>
<!-- <parallel failonany="true">-->
<!-- <exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
<!-- <arg value="${dmgName}" />-->
<!-- <arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
<!-- </exec>-->
<!-- <exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
<!-- <arg value="${dmgName-aarch64}" />-->
<!-- <arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
<!-- </exec>-->
<!-- </parallel>-->
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>upload-product-bundles</id>
<phase>deploy</phase>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA-256" fileext=".sha256" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA-256" fileext=".sha256" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="MD5" fileext=".md5" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
<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" />
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
<delete bucketName="${dist.bucket}">
<fileset dir="${dist.path.product}">
<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" />
<include name="spring-tool-suite-4*.tar.gz.sha256" />
<include name="spring-tool-suite-4*.dmg" />
<include name="spring-tool-suite-4*.dmg.md5" />
<include name="spring-tool-suite-4*.dmg.sha1" />
<include name="spring-tool-suite-4*.dmg.sha256" />
</fileset>
</delete>
<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
publicRead="true">
<fileset dir="${project.build.directory}/products">
<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" />
<include name="spring-tool-suite-4*.dmg" />
<include name="spring-tool-suite-4*.dmg.md5" />
<include name="spring-tool-suite-4*.dmg.sha256" />
</fileset>
</upload>
</s3>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>update-nightly-downloads</id>
<phase>verify</phase>
@@ -587,11 +345,11 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet-incl-apple-m1.html" tofile="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" overwrite="true"/>
<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet-incl-apple-m1.html" tofile="${project.build.directory}/sts4-nightly-${dist.target.major}.html" overwrite="true"/>
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
<replace file="${project.build.directory}/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
<replace file="${project.build.directory}/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
<replace file="${project.build.directory}/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
</target>
</configuration>
@@ -610,7 +368,7 @@
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
<upload bucketName="${dist.bucket}" file="${project.build.directory}/sts4-nightly-${dist.target.major}.html"
toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
</upload>
</s3>

View File

@@ -324,251 +324,6 @@
<version>1.7</version>
<executions>
<!-- 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>
<phase>package</phase>
<configuration>
<skip>${skip.osx.signing}</skip>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--timestamp"/>
<arg value="--entitlements"/>
<arg value="${project.build.directory}/../entitlements.plist"/>
<arg value="--options=runtime"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
</exec>
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--timestamp"/>
<arg value="--entitlements"/>
<arg value="${project.build.directory}/../entitlements.plist"/>
<arg value="--options=runtime"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app"/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!-- the creation of the DMG file is based on appdmg: https://www.npmjs.com/package/appdmg -->
<execution>
<id>osx-dmg-creation</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.notarizing}</skip>
<target>
<exec executable="/usr/local/bin/appdmg" failonerror="true">
<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-x86.json"/>
<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
</exec>
<!--<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>-->
<exec executable="/usr/local/bin/appdmg" failonerror="true">
<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-aarch64.json"/>
<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg"/>
</exec>
<!--<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.tar.gz"/>-->
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>osx-dmg-signing</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.signing}</skip>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--timestamp"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${dmgName}"/>
</exec>
<property name="dmgName-aarch" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--timestamp"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${dmgName-aarch}"/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!-- the notarizing of the DMG file needs this service running somewhere: https://github.com/eclipse-cbi/macos-notarization-service -->
<execution>
<id>osx-dmg-notarizing</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.notarizing}</skip>
<target>
<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
<property name="dmgName-aarch64" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="store-credentials" />
<arg value="notarize-app-dmg-profile" />
<arg value="--apple-id" />
<arg value="${env.AC_USERNAME}" />
<arg value="--team-id" />
<arg value="${env.APPLE_TEAM_ID}" />
<arg value="--password" />
<arg value="${env.AC_PASSWORD}" />
</exec>
<parallel failonany="true">
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="submit" />
<arg value="${dmgName}" />
<arg value="--keychain-profile" />
<arg value="notarize-app-dmg-profile" />
<arg value="--wait" />
</exec>
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="submit" />
<arg value="${dmgName-aarch64}" />
<arg value="--keychain-profile" />
<arg value="notarize-app-dmg-profile" />
<arg value="--wait" />
</exec>
</parallel>
<parallel failonany="true">
<exec executable="xcrun" failonerror="true">
<arg value="stapler" />
<arg value="staple" />
<arg value="${dmgName}" />
</exec>
<exec executable="xcrun" failonerror="true">
<arg value="stapler" />
<arg value="staple" />
<arg value="${dmgName-aarch64}" />
</exec>
</parallel>
<!-- <parallel failonany="true">-->
<!-- <exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
<!-- <arg value="${dmgName}" />-->
<!-- <arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
<!-- </exec>-->
<!-- <exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
<!-- <arg value="${dmgName-aarch64}" />-->
<!-- <arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
<!-- </exec>-->
<!-- </parallel>-->
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>upload-product-bundles</id>
<phase>deploy</phase>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA-256" fileext=".sha256" />-->
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />-->
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA-256" fileext=".sha256" />-->
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="MD5" fileext=".md5" />-->
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA-256" fileext=".sha256" />-->
<!-- <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" />-->
<!-- <s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">-->
<!-- <delete bucketName="${dist.bucket}">-->
<!-- <fileset dir="${dist.path.product}">-->
<!-- <include name="spring-tool-suite-4*linux*.tar.gz*" />-->
<!-- <include name="spring-tool-suite-4*.dmg" />-->
<!-- <include name="spring-tool-suite-4*.dmg.md5" />-->
<!-- <include name="spring-tool-suite-4*.dmg.sha1" />-->
<!-- <include name="spring-tool-suite-4*.dmg.sha256" />-->
<!-- </fileset>-->
<!-- </delete>-->
<!-- <upload bucketName="${dist.bucket}" toDir="${dist.path.product}"-->
<!-- publicRead="true">-->
<!-- <fileset dir="${project.build.directory}/products">-->
<!-- <include name="spring-tool-suite-4*linux*.tar.gz*" />-->
<!--&lt;!&ndash; <include name="spring-tool-suite-4*.dmg" />&ndash;&gt;-->
<!--&lt;!&ndash; <include name="spring-tool-suite-4*.dmg.md5" />&ndash;&gt;-->
<!--&lt;!&ndash; <include name="spring-tool-suite-4*.dmg.sha256" />&ndash;&gt;-->
<!-- </fileset>-->
<!-- </upload>-->
<!-- </s3>-->
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>update-nightly-downloads</id>
<phase>verify</phase>

View File

@@ -336,255 +336,6 @@
<version>1.7</version>
<executions>
<!-- 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>
<phase>package</phase>
<configuration>
<skip>${skip.osx.signing}</skip>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--timestamp"/>
<arg value="--entitlements"/>
<arg value="${project.build.directory}/../entitlements.plist"/>
<arg value="--options=runtime"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
</exec>
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--timestamp"/>
<arg value="--entitlements"/>
<arg value="${project.build.directory}/../entitlements.plist"/>
<arg value="--options=runtime"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app"/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!-- the creation of the DMG file is based on appdmg: https://www.npmjs.com/package/appdmg -->
<execution>
<id>osx-dmg-creation</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.notarizing}</skip>
<target>
<exec executable="/usr/local/bin/appdmg" failonerror="true">
<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-x86.json"/>
<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
</exec>
<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
<exec executable="/usr/local/bin/appdmg" failonerror="true">
<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-aarch64.json"/>
<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg"/>
</exec>
<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.tar.gz"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>osx-dmg-signing</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.signing}</skip>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--timestamp"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${dmgName}"/>
</exec>
<property name="dmgName-aarch" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
<exec executable="codesign" failonerror="true">
<arg value="--verbose"/>
<arg value="--deep"/>
<arg value="--force"/>
<arg value="--timestamp"/>
<arg value="--keychain"/>
<arg value="${env.KEYCHAIN}"/>
<arg value="-s"/>
<arg value="${env.MACOS_CERTIFICATE_ID}"/>
<arg value="${dmgName-aarch}"/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!-- the notarizing of the DMG file needs this service running somewhere: https://github.com/eclipse-cbi/macos-notarization-service -->
<execution>
<id>osx-dmg-notarizing</id>
<phase>verify</phase>
<configuration>
<skip>${skip.osx.notarizing}</skip>
<target>
<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
<property name="dmgName-aarch64" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="store-credentials" />
<arg value="notarize-app-dmg-profile" />
<arg value="--apple-id" />
<arg value="${env.AC_USERNAME}" />
<arg value="--team-id" />
<arg value="${env.APPLE_TEAM_ID}" />
<arg value="--password" />
<arg value="${env.AC_PASSWORD}" />
</exec>
<parallel failonany="true">
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="submit" />
<arg value="${dmgName}" />
<arg value="--keychain-profile" />
<arg value="notarize-app-dmg-profile" />
<arg value="--wait" />
</exec>
<exec executable="xcrun" failonerror="true">
<arg value="notarytool" />
<arg value="submit" />
<arg value="${dmgName-aarch64}" />
<arg value="--keychain-profile" />
<arg value="notarize-app-dmg-profile" />
<arg value="--wait" />
</exec>
</parallel>
<parallel failonany="true">
<exec executable="xcrun" failonerror="true">
<arg value="stapler" />
<arg value="staple" />
<arg value="${dmgName}" />
</exec>
<exec executable="xcrun" failonerror="true">
<arg value="stapler" />
<arg value="staple" />
<arg value="${dmgName-aarch64}" />
</exec>
</parallel>
<!-- <parallel failonany="true">-->
<!-- <exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
<!-- <arg value="${dmgName}" />-->
<!-- <arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
<!-- </exec>-->
<!-- <exec executable="${project.build.directory}/../macos-notarize.sh" failonerror="true">-->
<!-- <arg value="${dmgName-aarch64}" />-->
<!-- <arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />-->
<!-- </exec>-->
<!-- </parallel>-->
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>upload-product-bundles</id>
<phase>deploy</phase>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA-256" fileext=".sha256" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA-256" fileext=".sha256" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="MD5" fileext=".md5" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
<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" />
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
<delete bucketName="${dist.bucket}">
<fileset dir="${dist.path.product}">
<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" />
<include name="spring-tool-suite-4*.tar.gz.sha256" />
<include name="spring-tool-suite-4*.dmg" />
<include name="spring-tool-suite-4*.dmg.md5" />
<include name="spring-tool-suite-4*.dmg.sha1" />
<include name="spring-tool-suite-4*.dmg.sha256" />
</fileset>
</delete>
<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
publicRead="true">
<fileset dir="${project.build.directory}/products">
<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" />
<include name="spring-tool-suite-4*.dmg" />
<include name="spring-tool-suite-4*.dmg.md5" />
<include name="spring-tool-suite-4*.dmg.sha256" />
</fileset>
</upload>
</s3>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>update-nightly-downloads</id>
@@ -595,11 +346,11 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet-incl-apple-m1.html" tofile="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" overwrite="true"/>
<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet-incl-apple-m1.html" tofile="${project.build.directory}/sts4-nightly-${dist.target.major}.html" overwrite="true"/>
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
<replace file="${project.build.directory}/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
<replace file="${project.build.directory}/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
<replace file="${project.build.directory}/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
</target>
</configuration>
@@ -618,7 +369,7 @@
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
<upload bucketName="${dist.bucket}" file="${project.build.directory}/sts4-nightly-${dist.target.major}.html"
toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
</upload>
</s3>