GHA: Sign binaries required signature. Invalidate cache for ls ext sn…

…apshot.
spring-projects · Nov 18, 2023 · 238e8d2 · 238e8d2
1 parent 9b31b80
commit 238e8d2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 71 deletions.
diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh
@@ -17,7 +17,7 @@ tar -zxf $file --directory ${dir}/${destination_folder_name}
 echo "Successfully extracted ${filename}"
 
 # sign problematic binaries
-for file in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -print | grep -E ".*/(libjansi\.jnilib|fsevents\.node)$"`
+for file in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E ".*/(kotlin-compiler-embeddable.*\.jar|fsevents\.node)$"`
 do
   echo "Signing binary file: ${file}"
   codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $file

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
@@ -28,8 +28,6 @@
 						<phase>validate</phase>
 						<configuration>
 							<target>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
 								<property name="qualifier" value="${unqualifiedVersion}.${p2.qualifier}" />
 								<property name="build.id" value="${buildQualifier}" />
 

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
@@ -76,7 +76,7 @@
 		<dist.pathpostfix>nightly</dist.pathpostfix>
 		<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
 
-		<sts4-language-servers-p2-repo>https://cdn.spring.io/spring-tools/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
+		<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
 
 		<tycho-version>4.0.4</tycho-version>
 		<encoding>UTF-8</encoding>

diff --git a/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
@@ -15,73 +15,6 @@
 		<dist.project>sts4-language-servers</dist.project>
 	</properties>  
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<id>upload-repo</id>
-						<phase>deploy</phase>
-						<configuration>
-							<target>
-
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
-
-								<property name="site.target.dir" value="${project.build.directory}" />
-
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-
-									<delete bucketName="${dist.bucket}">
-										<fileset dir="${dist.path}">
-											<include name="site.xml" />
-											<include name="content.jar" />
-											<include name="artifacts.jar" />
-											<include name="plugins/**" />
-											<include name="features/**" />
-										</fileset>
-									</delete>
-
-									<upload bucketName="${dist.bucket}" toDir="${dist.path}" publicRead="true">
-										<fileset dir="${site.target.dir}/repository">
-											<include name="**/*" />
-											<include name="**" />
-										</fileset>
-									</upload>
-
-								</s3>
-
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.build</groupId>
-						<artifactId>org.springframework.build.aws.ant</artifactId>
-						<version>3.0.6.RELEASE</version>
-					</dependency>
-					<dependency>
-						<groupId>net.java.dev.jets3t</groupId>
-						<artifactId>jets3t</artifactId>
-						<version>0.8.1</version>
-					</dependency>
-					<dependency>
-						<groupId>ant-contrib</groupId>
-						<artifactId>ant-contrib</artifactId>
-						<version>20020829</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
-
 	<profiles>
 		<profile>
 			<id>gpg.sign</id>