Skip to content

Commit a9d8c6a

Browse files
BoykoAlexBoykoAlex
committed
Eclipse distro JAR and EXE signing
1 parent 9f78d43 commit a9d8c6a

File tree

9 files changed

+214
-100
lines changed

9 files changed

+214
-100
lines changed

‎eclipse-distribution/org.springframework.boot.ide.product.e425/pom.xml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -350,24 +350,31 @@
350350

351351
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
352352

353-
<exec executable="osslsigncode" failonerror="true">
354-
<arg value="sign"/>
355-
<arg value="-pkcs12"/>
356-
<arg value="${env.WIN_KEY_LOCATION}"/>
357-
<arg value="-pass"/>
358-
<arg value="${env.bamboo_vault_signing_passphrase}"/>
359-
<arg value="-n"/>
360-
<arg value="Spring Tools 4"/>
361-
<arg value="-i"/>
362-
<arg value="https://spring.io"/>
363-
<arg value="-t"/>
364-
<arg value="http://timestamp.digicert.com"/>
365-
<arg value="-in"/>
353+
<exec executable="${project.parent.basedir}/scripts/sign-exe.sh" failonerror="true">
354+
<env key="SSH_USER" path="${vm-signing.ssh.user}" />
355+
<env key="SSH_KEY" path="${vm-signing.ssh.key}" />
356+
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
366357
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
367-
<arg value="-out"/>
368-
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
369358
</exec>
370359

360+
<!-- <exec executable="osslsigncode" failonerror="true">-->
361+
<!-- <arg value="sign"/>-->
362+
<!-- <arg value="-pkcs12"/>-->
363+
<!-- <arg value="${env.WIN_KEY_LOCATION}"/>-->
364+
<!-- <arg value="-pass"/>-->
365+
<!-- <arg value="${env.bamboo_vault_signing_passphrase}"/>-->
366+
<!-- <arg value="-n"/>-->
367+
<!-- <arg value="Spring Tools 4"/>-->
368+
<!-- <arg value="-i"/>-->
369+
<!-- <arg value="https://spring.io"/>-->
370+
<!-- <arg value="-t"/>-->
371+
<!-- <arg value="http://timestamp.digicert.com"/>-->
372+
<!-- <arg value="-in"/>-->
373+
<!-- <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
374+
<!-- <arg value="-out"/>-->
375+
<!-- <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
376+
<!-- </exec>-->
377+
371378
</target>
372379
</configuration>
373380
<goals>

‎eclipse-distribution/org.springframework.boot.ide.product.e426/pom.xml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -362,24 +362,31 @@
362362

363363
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
364364

365-
<exec executable="osslsigncode" failonerror="true">
366-
<arg value="sign"/>
367-
<arg value="-pkcs12"/>
368-
<arg value="${env.WIN_KEY_LOCATION}"/>
369-
<arg value="-pass"/>
370-
<arg value="${env.bamboo_vault_signing_passphrase}"/>
371-
<arg value="-n"/>
372-
<arg value="Spring Tools 4"/>
373-
<arg value="-i"/>
374-
<arg value="https://spring.io"/>
375-
<arg value="-t"/>
376-
<arg value="http://timestamp.digicert.com"/>
377-
<arg value="-in"/>
365+
<exec executable="${project.parent.basedir}/scripts/sign-exe.sh" failonerror="true">
366+
<env key="SSH_USER" path="${vm-signing.ssh.user}" />
367+
<env key="SSH_KEY" path="${vm-signing.ssh.key}" />
368+
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
378369
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
379-
<arg value="-out"/>
380-
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
381370
</exec>
382371

372+
<!-- <exec executable="osslsigncode" failonerror="true">-->
373+
<!-- <arg value="sign"/>-->
374+
<!-- <arg value="-pkcs12"/>-->
375+
<!-- <arg value="${env.WIN_KEY_LOCATION}"/>-->
376+
<!-- <arg value="-pass"/>-->
377+
<!-- <arg value="${env.bamboo_vault_signing_passphrase}"/>-->
378+
<!-- <arg value="-n"/>-->
379+
<!-- <arg value="Spring Tools 4"/>-->
380+
<!-- <arg value="-i"/>-->
381+
<!-- <arg value="https://spring.io"/>-->
382+
<!-- <arg value="-t"/>-->
383+
<!-- <arg value="http://timestamp.digicert.com"/>-->
384+
<!-- <arg value="-in"/>-->
385+
<!-- <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
386+
<!-- <arg value="-out"/>-->
387+
<!-- <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
388+
<!-- </exec>-->
389+
383390
</target>
384391
</configuration>
385392
<goals>

‎eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -362,24 +362,31 @@
362362

363363
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
364364

365-
<exec executable="osslsigncode" failonerror="true">
366-
<arg value="sign"/>
367-
<arg value="-pkcs12"/>
368-
<arg value="${env.WIN_KEY_LOCATION}"/>
369-
<arg value="-pass"/>
370-
<arg value="${env.bamboo_vault_signing_passphrase}"/>
371-
<arg value="-n"/>
372-
<arg value="Spring Tools 4"/>
373-
<arg value="-i"/>
374-
<arg value="https://spring.io"/>
375-
<arg value="-t"/>
376-
<arg value="http://timestamp.digicert.com"/>
377-
<arg value="-in"/>
365+
<exec executable="${project.parent.basedir}/scripts/sign-exe.sh" failonerror="true">
366+
<env key="SSH_USER" path="${vm-signing.ssh.user}" />
367+
<env key="SSH_KEY" path="${vm-signing.ssh.key}" />
368+
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
378369
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
379-
<arg value="-out"/>
380-
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
381370
</exec>
382371

372+
<!-- <exec executable="osslsigncode" failonerror="true">-->
373+
<!-- <arg value="sign"/>-->
374+
<!-- <arg value="-pkcs12"/>-->
375+
<!-- <arg value="${env.WIN_KEY_LOCATION}"/>-->
376+
<!-- <arg value="-pass"/>-->
377+
<!-- <arg value="${env.bamboo_vault_signing_passphrase}"/>-->
378+
<!-- <arg value="-n"/>-->
379+
<!-- <arg value="Spring Tools 4"/>-->
380+
<!-- <arg value="-i"/>-->
381+
<!-- <arg value="https://spring.io"/>-->
382+
<!-- <arg value="-t"/>-->
383+
<!-- <arg value="http://timestamp.digicert.com"/>-->
384+
<!-- <arg value="-in"/>-->
385+
<!-- <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
386+
<!-- <arg value="-out"/>-->
387+
<!-- <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
388+
<!-- </exec>-->
389+
383390
</target>
384391
</configuration>
385392
<goals>

‎eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -362,24 +362,31 @@
362362

363363
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
364364

365-
<exec executable="osslsigncode" failonerror="true">
366-
<arg value="sign"/>
367-
<arg value="-pkcs12"/>
368-
<arg value="${env.WIN_KEY_LOCATION}"/>
369-
<arg value="-pass"/>
370-
<arg value="${env.bamboo_vault_signing_passphrase}"/>
371-
<arg value="-n"/>
372-
<arg value="Spring Tools 4"/>
373-
<arg value="-i"/>
374-
<arg value="https://spring.io"/>
375-
<arg value="-t"/>
376-
<arg value="http://timestamp.digicert.com"/>
377-
<arg value="-in"/>
365+
<exec executable="${project.parent.basedir}/scripts/sign-exe.sh" failonerror="true">
366+
<env key="SSH_USER" path="${vm-signing.ssh.user}" />
367+
<env key="SSH_KEY" path="${vm-signing.ssh.key}" />
368+
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
378369
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
379-
<arg value="-out"/>
380-
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>
381370
</exec>
382371

372+
<!-- <exec executable="osslsigncode" failonerror="true">-->
373+
<!-- <arg value="sign"/>-->
374+
<!-- <arg value="-pkcs12"/>-->
375+
<!-- <arg value="${env.WIN_KEY_LOCATION}"/>-->
376+
<!-- <arg value="-pass"/>-->
377+
<!-- <arg value="${env.bamboo_vault_signing_passphrase}"/>-->
378+
<!-- <arg value="-n"/>-->
379+
<!-- <arg value="Spring Tools 4"/>-->
380+
<!-- <arg value="-i"/>-->
381+
<!-- <arg value="https://spring.io"/>-->
382+
<!-- <arg value="-t"/>-->
383+
<!-- <arg value="http://timestamp.digicert.com"/>-->
384+
<!-- <arg value="-in"/>-->
385+
<!-- <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
386+
<!-- <arg value="-out"/>-->
387+
<!-- <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>-->
388+
<!-- </exec>-->
389+
383390
</target>
384391
</configuration>
385392
<goals>

‎eclipse-distribution/pom.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
<encoding>UTF-8</encoding>
9696

9797
<misc.p2.repo.version>3.9.4.202211021051</misc.p2.repo.version>
98+
99+
<vm-signing.ssh.user>signer</vm-signing.ssh.user>
100+
<vm-signing.ssh.key>/home/bamboo/.ssh/id_rsa</vm-signing.ssh.key>
98101
</properties>
99102

100103
<profiles>
@@ -147,6 +150,32 @@
147150
</properties>
148151
</profile>
149152

153+
<profile>
154+
<id>vm-signing</id>
155+
<build>
156+
<plugins>
157+
<plugin>
158+
<artifactId>exec-maven-plugin</artifactId>
159+
<groupId>org.codehaus.mojo</groupId>
160+
<executions>
161+
<execution>
162+
<id>VM JAR Sign</id>
163+
<phase>package</phase>
164+
<goals>
165+
<goal>exec</goal>
166+
</goals>
167+
</execution>
168+
</executions>
169+
<configuration>
170+
<arguments>
171+
<argument>${project.build.directory}</argument>
172+
</arguments>
173+
</configuration>
174+
</plugin>
175+
</plugins>
176+
</build>
177+
</profile>
178+
150179
<profile>
151180
<id>e425</id>
152181
<properties>
@@ -866,6 +895,18 @@
866895
</dependencies>
867896
</plugin>
868897

898+
<plugin>
899+
<artifactId>exec-maven-plugin</artifactId>
900+
<groupId>org.codehaus.mojo</groupId>
901+
<configuration>
902+
<executable>scripts/sign-jars.sh</executable>
903+
<environmentVariables>
904+
<SSH_USER>${vm-signing.ssh.user}</SSH_USER>
905+
<SSH_KEY>${vm-signing.ssh.key}</SSH_KEY>
906+
</environmentVariables>
907+
</configuration>
908+
</plugin>
909+
869910
</plugins>
870911
</pluginManagement>
871912
</build>

‎eclipse-distribution/scripts/sign-exe.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
set -e
2+
in_file=$1
3+
out_file=$2
4+
5+
in_filename="$(basename -- $in_file)"
6+
7+
echo "Copying $in_filename to remote machine..."
8+
scp -i $SSH_KEY $in_file $SSH_USER@vm-tools.spring.vmware.com:/opt/bamboo
9+
echo "Signing $in_filename..."
10+
ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- /build/apps/signing/signserver/signc -v --input=/opt/bamboo/$in_filename --keyid=authenticode_SHA2 --signmethod="winddk-8.1" --output=/opt/bamboo/$in_filename --hash sha256
11+
echo "Copying **signed** $in_filename back... (into $out_file)"
12+
scp -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com:/opt/bamboo/$in_filename $out_file
13+
echo "Cleaning up remote machine..."
14+
ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm /opt/bamboo/$in_filename
15+
echo "Successfully signed $in_filename"
16+

‎eclipse-distribution/scripts/sign-jars.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
set -e
2+
target_folder=$1
3+
if [ -d "$target_folder" ]
4+
then
5+
echo "Sign JARs in directory: $target_folder"
6+
files=`ls $target_folder`
7+
for file in $files
8+
do
9+
# echo "Found $file..."
10+
if ! [ -d $file ]
11+
then
12+
# echo "Looking at: $target_folder/$file"
13+
extension="${file##*.}"
14+
# echo "Detected extension = $extension"
15+
if [ "$extension" = "jar" ]
16+
then
17+
echo "Copying $file to remote machine..."
18+
scp -i $SSH_KEY $target_folder/$file $SSH_USER@vm-tools.spring.vmware.com:/opt/bamboo
19+
echo "Signing $file..."
20+
ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- /build/apps/signing/signserver/signc -v --input=/opt/bamboo/$file --keyid=jarsign_vmware --signmethod="jdk-1.8.0_121" --output=/opt/bamboo/$file
21+
echo "Copying **signed** $file back... (into $target_folder/$file)"
22+
scp -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com:/opt/bamboo/$file $target_folder/$file
23+
echo "Cleaning up remote machine..."
24+
ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm /opt/bamboo/$file
25+
echo "Successfully signed $file"
26+
fi
27+
fi
28+
done
29+
fi

‎eclipse-language-servers/pom.xml

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,31 @@
160160
</properties>
161161
</profile>
162162

163+
<profile>
164+
<id>vm-signing</id>
165+
<build>
166+
<plugins>
167+
<plugin>
168+
<artifactId>exec-maven-plugin</artifactId>
169+
<groupId>org.codehaus.mojo</groupId>
170+
<executions>
171+
<execution>
172+
<id>VM JAR Sign</id>
173+
<phase>package</phase>
174+
<goals>
175+
<goal>exec</goal>
176+
</goals>
177+
</execution>
178+
</executions>
179+
<configuration>
180+
<arguments>
181+
<argument>${project.build.directory}</argument>
182+
</arguments>
183+
</configuration>
184+
</plugin>
185+
</plugins>
186+
</build>
187+
</profile>
163188

164189
<profile>
165190
<id>e425</id>
@@ -394,32 +419,6 @@
394419
</properties>
395420
</profile>
396421

397-
<profile>
398-
<id>vm-signing</id>
399-
<build>
400-
<plugins>
401-
<plugin>
402-
<artifactId>exec-maven-plugin</artifactId>
403-
<groupId>org.codehaus.mojo</groupId>
404-
<executions>
405-
<execution><!-- Run our version calculation script -->
406-
<id>VM JAR Sign</id>
407-
<phase>package</phase>
408-
<goals>
409-
<goal>exec</goal>
410-
</goals>
411-
</execution>
412-
</executions>
413-
<configuration>
414-
<arguments>
415-
<argument>${project.build.directory}</argument>
416-
</arguments>
417-
</configuration>
418-
</plugin>
419-
</plugins>
420-
</build>
421-
</profile>
422-
423422
</profiles>
424423

425424
<repositories>
@@ -671,13 +670,13 @@
671670
<plugin>
672671
<artifactId>exec-maven-plugin</artifactId>
673672
<groupId>org.codehaus.mojo</groupId>
674-
<configuration>
675-
<executable>scripts/sign-jars.sh</executable>
676-
<environmentVariables>
677-
<SSH_USER>${vm-signing.ssh.user}</SSH_USER>
678-
<SSH_KEY>${vm-signing.ssh.key}</SSH_KEY>
679-
</environmentVariables>
680-
</configuration>
673+
<configuration>
674+
<executable>scripts/sign-jars.sh</executable>
675+
<environmentVariables>
676+
<SSH_USER>${vm-signing.ssh.user}</SSH_USER>
677+
<SSH_KEY>${vm-signing.ssh.key}</SSH_KEY>
678+
</environmentVariables>
679+
</configuration>
681680
</plugin>
682681

683682
</plugins>

0 commit comments

Comments
 (0)