From 0a6cb9690d2b9d8a049351733e84db9783d1fb46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Wed, 27 Nov 2024 16:05:16 +0200
Subject: [PATCH 1/2] Update to latest ecj snapshot version

---
 eclipse-platform-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index c15f11ee57e..3cc55feddd3 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -88,7 +88,7 @@
     <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
 
     <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
-    <cbi-ecj-version>3.40.0.v20241112-0530</cbi-ecj-version>
+    <cbi-ecj-version>3.40.100.v20241127-0801</cbi-ecj-version>
 
     <!--
       repo for released versions of CBI. Note, we intentionally use as specific a repo as possible.

From bdadb69dad879afa3c60eca311515d6df9763957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Wed, 27 Nov 2024 19:43:19 +0200
Subject: [PATCH 2/2] Rename gpg pashprase env variable for maven

Fixes warnings :
```
12:37:46  [WARNING]  Parameter 'passphrase' (user property
'gpg.passphrase') is deprecated: Do not use this configuration, it may
leak sensitive information. Rely on gpg-agent or env variables instead.
12:37:46  [WARNING]
12:37:46  [WARNING] W A R N I N G
12:37:46  [WARNING]
12:37:46  [WARNING] Do not store passphrase in any file (disk or SCM
repository),
12:37:46  [WARNING] instead rely on GnuPG agent or provide passphrase in
12:37:46  [WARNING] MAVEN_GPG_PASSPHRASE environment variable for batch
mode.
12:37:46  [WARNING]
12:37:46  [WARNING] Sensitive content loaded from Mojo configuration
```

from I-builds.
Rename is being done only for this step to get rid of the warning as for
the other steps it's not a maven env variable (thus shouldn't be named
like that) and will require changing multiple scripts.
---
 JenkinsJobs/Builds/I_build.groovy               | 2 +-
 cje-production/mbscripts/mb220_buildSdkPatch.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy
index 8c24adb9e9a..dd7da07da75 100644
--- a/JenkinsJobs/Builds/I_build.groovy
+++ b/JenkinsJobs/Builds/I_build.groovy
@@ -247,7 +247,7 @@ spec:
 	  stage('Aggregator maven build'){
 	      environment {
                 KEYRING = credentials('secret-subkeys-releng.asc')
-                KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase')
+                MAVEN_GPG_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase')
           }
           steps {
               container('jnlp') {
diff --git a/cje-production/mbscripts/mb220_buildSdkPatch.sh b/cje-production/mbscripts/mb220_buildSdkPatch.sh
index fc5498889c6..9d31b4fa63d 100755
--- a/cje-production/mbscripts/mb220_buildSdkPatch.sh
+++ b/cje-production/mbscripts/mb220_buildSdkPatch.sh
@@ -43,7 +43,6 @@ mvn clean verify -DskipTests=true ${MVN_ARGS} \
   -DbuildType=$BUILD_TYPE \
   -DbuildId=$BUILD_ID \
   -Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE \
-  -Dgpg.passphrase=${KEYRING_PASSPHRASE} \
   -Dcbi-ecj-version=99.99 \
   -e \
   -T 1C \