From e1981cf979b0a93fde211755d2984b8ea0eff5cc Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Fri, 8 Jan 2021 18:32:57 +0100 Subject: [PATCH 01/23] #5 Add signing of JARS, Windows executables and macOS apps. --- .../org.eclipse.escet.configuration/pom.xml | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/releng/org.eclipse.escet.configuration/pom.xml b/releng/org.eclipse.escet.configuration/pom.xml index 199ef621b..0180bc62a 100644 --- a/releng/org.eclipse.escet.configuration/pom.xml +++ b/releng/org.eclipse.escet.configuration/pom.xml @@ -35,6 +35,9 @@ 3.1.1 + + + 1.1.7 @@ -388,6 +391,77 @@ + + + sign + + + + + org.eclipse.cbi.maven.plugins + eclipse-jarsigner-plugin + ${eclipse.cbi.version} + + + sign + verify + + sign + + + + + + + + org.eclipse.cbi.maven.plugins + eclipse-winsigner-plugin + ${eclipse.cbi.version} + + + sign + + sign + + package + + + ${project.build.directory}/products/${product-folder}/win32/win32/x86_64/eclipse.exe + ${project.build.directory}/products/${product-folder}/win32/win32/x86_64/eclipsec.exe + + + + + + + + + org.eclipse.cbi.maven.plugins + eclipse-macsigner-plugin + ${eclipse.cbi.version} + + + sign + + sign + + package + + + ${project.build.directory}/products/${product-folder}/macosx/cocoa/x86_64/Eclipse.app + + 300000 + ${macSigner.forceContinue} + ${project.basedir}/application.entitlement + + + + + + + + + -- GitLab From 9e3599526896ba52e9fdcb75d5eaaea334d78d9f Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Fri, 8 Jan 2021 18:37:44 +0100 Subject: [PATCH 02/23] #5 Undo auto-formatting of pom.xml license header. --- releng/org.eclipse.escet.configuration/pom.xml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/releng/org.eclipse.escet.configuration/pom.xml b/releng/org.eclipse.escet.configuration/pom.xml index 0180bc62a..f7b6a8408 100644 --- a/releng/org.eclipse.escet.configuration/pom.xml +++ b/releng/org.eclipse.escet.configuration/pom.xml @@ -1,7 +1,15 @@ - + -- GitLab From d6aba4891bd6765a6e4d45853bb0b9c91600c492 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Fri, 8 Jan 2021 19:17:18 +0100 Subject: [PATCH 03/23] #5 Enable signing profile on Jenkins. --- Jenkinsfile | 2 +- build.cmd | 2 +- build.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1e07852e8..40fff4007 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { sh ''' java -version mvn -version - ./build.sh + ./build.sh -Psign ''' } } diff --git a/build.cmd b/build.cmd index 4dcc7ac71..1c26a2302 100644 --- a/build.cmd +++ b/build.cmd @@ -12,4 +12,4 @@ :: SPDX-License-Identifier: MIT :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -.\mvn_escet.cmd clean verify +.\mvn_escet.cmd clean verify %* diff --git a/build.sh b/build.sh index 837c24b42..0cbad4642 100755 --- a/build.sh +++ b/build.sh @@ -12,4 +12,4 @@ # SPDX-License-Identifier: MIT ################################################################################ -./mvn_escet.sh clean verify +./mvn_escet.sh clean verify $* -- GitLab From 664b78cd1c32b2ff7fd0714364f8b0e5a1fc3058 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Fri, 8 Jan 2021 19:27:09 +0100 Subject: [PATCH 04/23] #5 Fixed Eclipse CBI version. --- releng/org.eclipse.escet.configuration/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/org.eclipse.escet.configuration/pom.xml b/releng/org.eclipse.escet.configuration/pom.xml index f7b6a8408..bad052996 100644 --- a/releng/org.eclipse.escet.configuration/pom.xml +++ b/releng/org.eclipse.escet.configuration/pom.xml @@ -45,7 +45,7 @@ SPDX-License-Identifier: MIT 3.1.1 - 1.1.7 + 1.1.5 -- GitLab From 3daaa5b852445d785b5db037ca4501de08d04949 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Fri, 8 Jan 2021 19:53:46 +0100 Subject: [PATCH 05/23] #5 Build configuration improvements for Eclipse CBI and Bintray. - Add Eclipse CBI plugin repository. - Use Eclipse CBI version 1.1.7 after all. - Document why we need Bintray jmini maven plugins repository. --- releng/org.eclipse.escet.configuration/pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/releng/org.eclipse.escet.configuration/pom.xml b/releng/org.eclipse.escet.configuration/pom.xml index bad052996..51135d4af 100644 --- a/releng/org.eclipse.escet.configuration/pom.xml +++ b/releng/org.eclipse.escet.configuration/pom.xml @@ -45,10 +45,17 @@ SPDX-License-Identifier: MIT 3.1.1 - 1.1.5 + 1.1.7 + + + eclipse.cbi + https://repo.eclipse.org/content/repositories/cbi-releases/ + + + bintray.jmini.maven http://dl.bintray.com/jmini/maven/ -- GitLab From eefb8c19fd5edd51402fa89760855e2bbc439b0b Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Fri, 8 Jan 2021 20:08:15 +0100 Subject: [PATCH 06/23] #5 Move executable/app signing to product. --- products/org.eclipse.escet.product/pom.xml | 57 +++++++++++++++++++ .../org.eclipse.escet.configuration/pom.xml | 47 --------------- 2 files changed, 57 insertions(+), 47 deletions(-) diff --git a/products/org.eclipse.escet.product/pom.xml b/products/org.eclipse.escet.product/pom.xml index 51e61c245..c523c1408 100644 --- a/products/org.eclipse.escet.product/pom.xml +++ b/products/org.eclipse.escet.product/pom.xml @@ -97,4 +97,61 @@ + + + + sign + + + + + org.eclipse.cbi.maven.plugins + eclipse-winsigner-plugin + ${eclipse.cbi.version} + + + sign + + sign + + package + + + ${project.build.directory}/products/${product-folder}/win32/win32/x86_64/eclipse.exe + ${project.build.directory}/products/${product-folder}/win32/win32/x86_64/eclipsec.exe + + + + + + + + + org.eclipse.cbi.maven.plugins + eclipse-macsigner-plugin + ${eclipse.cbi.version} + + + sign + + sign + + package + + + ${project.build.directory}/products/${product-folder}/macosx/cocoa/x86_64/Eclipse.app + + 300000 + ${macSigner.forceContinue} + ${project.basedir}/application.entitlement + + + + + + + + + + diff --git a/releng/org.eclipse.escet.configuration/pom.xml b/releng/org.eclipse.escet.configuration/pom.xml index 51135d4af..6c7ae998a 100644 --- a/releng/org.eclipse.escet.configuration/pom.xml +++ b/releng/org.eclipse.escet.configuration/pom.xml @@ -426,53 +426,6 @@ SPDX-License-Identifier: MIT - - - - org.eclipse.cbi.maven.plugins - eclipse-winsigner-plugin - ${eclipse.cbi.version} - - - sign - - sign - - package - - - ${project.build.directory}/products/${product-folder}/win32/win32/x86_64/eclipse.exe - ${project.build.directory}/products/${product-folder}/win32/win32/x86_64/eclipsec.exe - - - - - - - - - org.eclipse.cbi.maven.plugins - eclipse-macsigner-plugin - ${eclipse.cbi.version} - - - sign - - sign - - package - - - ${project.build.directory}/products/${product-folder}/macosx/cocoa/x86_64/Eclipse.app - - 300000 - ${macSigner.forceContinue} - ${project.basedir}/application.entitlement - - - - - -- GitLab From cbee71e334fbee4f91b8492e8fb1fb7415f3d9de Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Fri, 8 Jan 2021 21:29:56 +0100 Subject: [PATCH 07/23] #5 Fix signing project name. --- products/org.eclipse.escet.product/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/products/org.eclipse.escet.product/pom.xml b/products/org.eclipse.escet.product/pom.xml index c523c1408..69927a1b1 100644 --- a/products/org.eclipse.escet.product/pom.xml +++ b/products/org.eclipse.escet.product/pom.xml @@ -117,8 +117,8 @@ package - ${project.build.directory}/products/${product-folder}/win32/win32/x86_64/eclipse.exe - ${project.build.directory}/products/${product-folder}/win32/win32/x86_64/eclipsec.exe + ${project.build.directory}/products/${project.name}/win32/win32/x86_64/eclipse.exe + ${project.build.directory}/products/${project.name}/win32/win32/x86_64/eclipsec.exe @@ -139,7 +139,7 @@ package - ${project.build.directory}/products/${product-folder}/macosx/cocoa/x86_64/Eclipse.app + ${project.build.directory}/products/${project.name}/macosx/cocoa/x86_64/Eclipse.app 300000 ${macSigner.forceContinue} -- GitLab From de0de2d2800d5968fbe5781bed9e7c1e6b7c620c Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 18:07:37 +0100 Subject: [PATCH 08/23] #5 Ensure product archiving happens after signing. - Need workaround as Maven does not have enough different phases. - Use well-known workaround. --- products/org.eclipse.escet.product/pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/products/org.eclipse.escet.product/pom.xml b/products/org.eclipse.escet.product/pom.xml index 69927a1b1..8e393e150 100644 --- a/products/org.eclipse.escet.product/pom.xml +++ b/products/org.eclipse.escet.product/pom.xml @@ -149,6 +149,24 @@ + + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho-version} + + + archive-products + + archive-products + + pre-integration-test + + + + -- GitLab From 1e28da8ba701ddacb9ec6367489bc49be4ff174f Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 18:08:35 +0100 Subject: [PATCH 09/23] #5 pom.xml comment fix. --- products/org.eclipse.escet.product/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/org.eclipse.escet.product/pom.xml b/products/org.eclipse.escet.product/pom.xml index 8e393e150..715197b90 100644 --- a/products/org.eclipse.escet.product/pom.xml +++ b/products/org.eclipse.escet.product/pom.xml @@ -150,7 +150,7 @@ - + org.eclipse.tycho -- GitLab From 2dc1c6d774dee0bd20b014a2e1127efc2876afe0 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 18:13:27 +0100 Subject: [PATCH 10/23] #5 More archive after sign fixing. --- products/org.eclipse.escet.product/pom.xml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/products/org.eclipse.escet.product/pom.xml b/products/org.eclipse.escet.product/pom.xml index 715197b90..b9e89c53e 100644 --- a/products/org.eclipse.escet.product/pom.xml +++ b/products/org.eclipse.escet.product/pom.xml @@ -90,6 +90,10 @@ archive-products + + + + pre-integration-test @@ -149,24 +153,6 @@ - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho-version} - - - archive-products - - archive-products - - pre-integration-test - - - - -- GitLab From 4548e1ffbae3fedd35171235967012acf4150429 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:05:23 +0100 Subject: [PATCH 11/23] #5 Test signing only on a certain branch. --- Jenkinsfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 40fff4007..aec725ed0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,12 +32,24 @@ pipeline { stages { stage('Build & Test') { + steps { + script { + switch(branch) { + case "5-add-jar-signing-to-build": + BUILD_ARGS = '-Psign' + break + default: + BUILD_ARGS = '' + } + } + } + steps { wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { sh ''' java -version mvn -version - ./build.sh -Psign + ./build.sh ${BUILD_ARGS} ''' } } -- GitLab From fcf61e7bf82827c21fb3dab4740c47fa29a9c81f Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:07:09 +0100 Subject: [PATCH 12/23] #5 Fix invalid Jenkinsfile. --- Jenkinsfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aec725ed0..a9e32be97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,9 +42,6 @@ pipeline { BUILD_ARGS = '' } } - } - - steps { wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { sh ''' java -version -- GitLab From 7a216bc021ff91bb14ec58324d021a690c1533c6 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:09:34 +0100 Subject: [PATCH 13/23] #5 Jenkinsfile: fix case distinction on branch name. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a9e32be97..91ca9d04c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { stage('Build & Test') { steps { script { - switch(branch) { + switch(env.BRANCH_NAME) { case "5-add-jar-signing-to-build": BUILD_ARGS = '-Psign' break -- GitLab From 103afdb9b36feee225787b27e498775cf58c4b3e Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:13:48 +0100 Subject: [PATCH 14/23] #5 Find correct environment variable to use. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 91ca9d04c..86b32808f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,6 +33,7 @@ pipeline { stages { stage('Build & Test') { steps { + sh 'printenv' script { switch(env.BRANCH_NAME) { case "5-add-jar-signing-to-build": -- GitLab From fa44664d7c09777ba2612c15b62f18e9d1eeb62e Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:22:00 +0100 Subject: [PATCH 15/23] #5 More branch-specific config testing. --- Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86b32808f..1dcbeb951 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,19 +35,20 @@ pipeline { steps { sh 'printenv' script { - switch(env.BRANCH_NAME) { + switch(env.GIT_BRANCH) { case "5-add-jar-signing-to-build": - BUILD_ARGS = '-Psign' + env.BUILD_ARGS = '-Psign' break default: - BUILD_ARGS = '' + env.BUILD_ARGS = '' } } + sh 'printenv' wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { sh ''' java -version mvn -version - ./build.sh ${BUILD_ARGS} + ./build.sh ${env.BUILD_ARGS} ''' } } -- GitLab From 655556189338af72847179ed25950451894274f8 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:40:13 +0100 Subject: [PATCH 16/23] #5 Jenkinsfile branch-specific config via 'sh' not 'script'. --- Jenkinsfile | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1dcbeb951..8e698c2a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,22 +33,18 @@ pipeline { stages { stage('Build & Test') { steps { - sh 'printenv' - script { - switch(env.GIT_BRANCH) { - case "5-add-jar-signing-to-build": - env.BUILD_ARGS = '-Psign' - break - default: - env.BUILD_ARGS = '' - } - } sh 'printenv' wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { sh ''' java -version mvn -version - ./build.sh ${env.BUILD_ARGS} + + BUILD_ARGS= + if [ "$GIT_BRANCH" == "5-add-jar-signing-to-build" ]; then + BUILD_ARGS = -Psign + fi + + ./build.sh $BUILD_ARGS ''' } } -- GitLab From 91ebc8dbdbdae4f3856ead6ff583a8cd89645e13 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:45:40 +0100 Subject: [PATCH 17/23] #5 Another Jenkinsfile fix. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e698c2a8..796a7cf53 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ pipeline { BUILD_ARGS = -Psign fi - ./build.sh $BUILD_ARGS + ./build.sh "$BUILD_ARGS" ''' } } -- GitLab From baf019aa40229a2816ca7c19b327a7da64fb0a13 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:53:44 +0100 Subject: [PATCH 18/23] #5 Jenkinsfile fixes. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 796a7cf53..a0e278ff8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { BUILD_ARGS= if [ "$GIT_BRANCH" == "5-add-jar-signing-to-build" ]; then - BUILD_ARGS = -Psign + BUILD_ARGS="-Psign" fi ./build.sh "$BUILD_ARGS" -- GitLab From d226c3398bd5612e256c6407f9b24a801e931586 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 20:55:40 +0100 Subject: [PATCH 19/23] #5 Jenkinsfile: test negation of condition as well. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a0e278ff8..02beaeefa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { mvn -version BUILD_ARGS= - if [ "$GIT_BRANCH" == "5-add-jar-signing-to-build" ]; then + if [ "$GIT_BRANCH" == "5-add-jar-signing-to-build2" ]; then BUILD_ARGS="-Psign" fi -- GitLab From b8608cd45dac9224fb6cdf401e308fb6bcf4b753 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 21:41:31 +0100 Subject: [PATCH 20/23] #5 Jenkinsfile cleanup. --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 02beaeefa..a4fd1b11a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,14 +33,13 @@ pipeline { stages { stage('Build & Test') { steps { - sh 'printenv' wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { sh ''' java -version mvn -version BUILD_ARGS= - if [ "$GIT_BRANCH" == "5-add-jar-signing-to-build2" ]; then + if [ "$GIT_BRANCH" == "master" ]; then BUILD_ARGS="-Psign" fi -- GitLab From 78dad5657a764a0d34923fd751706fa429213e4f Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 21:42:08 +0100 Subject: [PATCH 21/23] #5 Jenkinsfile: archive metamodel docs as well. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a4fd1b11a..ed15c7528 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,6 +52,7 @@ pipeline { success { // Documentation. archiveArtifacts '*/org.eclipse.escet.*documentation/target/*.zip' + archiveArtifacts '*/org.eclipse.escet.*.metamodel/docs/*.pdf' // Update site. archiveArtifacts 'products/org.eclipse.escet.product/target/*.zip' -- GitLab From 5256e1406f254a085b50ca651187ebdc4b57591c Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Mon, 11 Jan 2021 22:39:56 +0100 Subject: [PATCH 22/23] #5 Revert: Jenkinsfile: archive metamodel docs as well This reverts commit 78dad5657a764a0d34923fd751706fa429213e4f. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ed15c7528..a4fd1b11a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,6 @@ pipeline { success { // Documentation. archiveArtifacts '*/org.eclipse.escet.*documentation/target/*.zip' - archiveArtifacts '*/org.eclipse.escet.*.metamodel/docs/*.pdf' // Update site. archiveArtifacts 'products/org.eclipse.escet.product/target/*.zip' -- GitLab From f9940ab603d988a21e5d11af8c40d45d66467b27 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Tue, 12 Jan 2021 08:26:05 +0100 Subject: [PATCH 23/23] #5 Jenkinsfile: document signing only on master branch. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a4fd1b11a..2c1247d57 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ pipeline { BUILD_ARGS= if [ "$GIT_BRANCH" == "master" ]; then + # Sign only for releases, on 'master' branch. BUILD_ARGS="-Psign" fi -- GitLab