From 7b3cda0e2a30ca61c2a2bea24c293217ba0db811 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: Thu, 30 May 2024 17:21:43 +0300
Subject: [PATCH 1/4] Enable pgp signing

---
 Jenkinsfile        | 12 +++++++++++-
 repository/pom.xml | 21 ++++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5558390..524d2d5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,6 +15,14 @@ pipeline {
         jdk 'temurin-jdk21-latest'
     }
 	stages {
+		stage('Initialize PGP') {
+			steps {
+				withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
+					sh 'gpg --batch --import "${KEYRING}"'
+					sh 'for fpr in $(gpg --list-keys --with-colons  | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" |  gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done'
+				}
+			}
+		}
 		stage('Prepare') {
 			steps {
 				sh 'org.eclipse.corrosion/scripts/rustup-init.sh -y'
@@ -29,8 +37,10 @@ pipeline {
 				sh 'cargo --version'
 				sh 'rustup show'
 				sh 'rust-gdb --version'
+				withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
 				wrap([$class: 'Xvnc', useXauthority: true]) {
-					sh './mvnw -Dmaven.repo.local=$WORKSPACE/.m2 clean verify -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.showEclipseLog=true -Psign -Dsurefire.timeout=1800'
+					sh './mvnw -Dmaven.repo.local=$WORKSPACE/.m2 clean verify -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.showEclipseLog=true -Psign -Dsurefire.timeout=1800 -Dgpg.passphrase="${KEYRING_PASSPHRASE}"'
+				}
 				}
 				sh 'rust-analyzer --version'
 			}
diff --git a/repository/pom.xml b/repository/pom.xml
index 64aac90..3513b10 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -105,21 +105,24 @@
 		</plugins>
 	</build>
 
-	<!--profiles>
+	<profiles>
 		<profile>
-			<id>packAndSign</id>
+			<id>sign</id>
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.eclipse.cbi.maven.plugins</groupId>
-						<artifactId>eclipse-dmg-packager</artifactId>
-						<version>1.1.8-SNAPSHOT</version>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-gpg-plugin</artifactId>
+						<version>${tycho-version}</version>
 						<executions>
 							<execution>
-								<goals><goal>package-dmg</goal></goals>
-								<phase>package</phase>
+								<id>pgpsigner</id>
+								<goals>
+									<goal>sign-p2-artifacts</goal>
+								</goals>
 								<configuration>
-									<source>${project.build.directory}/products/eclipseide-rust-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-macosx-cocoa-x86_64.tar.gz</source>
+									<keyname>19C6F458E5758349</keyname>
+									<skipIfJarsigned>false</skipIfJarsigned>
 								</configuration>
 							</execution>
 						</executions>
@@ -127,7 +130,7 @@
 				</plugins>
 			</build>
 		</profile>
-	</profiles-->
+	</profiles>
 
 	<repositories>
 		<repository>

From 3e0ff02f818e07679ef896b88a3e01ac7feefa8c 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: Thu, 30 May 2024 18:11:11 +0300
Subject: [PATCH 2/4] Archive repository in Jenkins builds

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 524d2d5..9ffae4e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
 					sh 'which rust-analyzer'
 					sh 'rust-analyzer --version'
 					junit '*/target/surefire-reports/TEST-*.xml'
-					archiveArtifacts artifacts: '*/target/work/data/.metadata/.log'
+					archiveArtifacts artifacts: '*/target/work/data/.metadata/.log,repository/target/repository/**'
 				}
 			}
 		}

From 29e5a27c74019b3628070dbd48082576272f0e56 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: Fri, 31 May 2024 09:55:16 +0300
Subject: [PATCH 3/4] Disable jarsigning

---
 pom.xml | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/pom.xml b/pom.xml
index a3cb765..b41ac3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,44 +158,6 @@
 
 
 	<profiles>
-		<profile>
-			<id>sign</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.cbi.maven.plugins</groupId>
-						<artifactId>eclipse-jarsigner-plugin</artifactId>
-						<version>1.4.3</version>
-						<executions>
-							<execution>
-								<id>sign</id>
-								<phase>package</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-p2-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<executions>
-							<execution>
-								<id>p2-metadata</id>
-								<phase>package</phase>
-								<goals>
-									<goal>p2-metadata</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<defaultP2Metadata>false</defaultP2Metadata>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<!-- Automatic profile for Mac-specific settings -->
 		<profile>
 			<id>macos</id>
@@ -210,12 +172,4 @@
 		</profile>
 	</profiles>
 
-	<pluginRepositories>
-		<pluginRepository>
-			<id>cbi</id>
-			<url>https://repo.eclipse.org/content/groups/cbi</url>
-			<snapshots><enabled>true</enabled></snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
 </project>

From ee52d758b4a54428157dac1fc9d94033ab942d6e 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: Fri, 31 May 2024 10:22:59 +0300
Subject: [PATCH 4/4] Upversion to 1.3.0

---
 org.eclipse.corrosion.feature/feature.xml                   | 2 +-
 org.eclipse.corrosion.product.branding/META-INF/MANIFEST.MF | 2 +-
 org.eclipse.corrosion.product.branding/pom.xml              | 4 ++--
 org.eclipse.corrosion.tests/META-INF/MANIFEST.MF            | 2 +-
 org.eclipse.corrosion/META-INF/MANIFEST.MF                  | 2 +-
 pom.xml                                                     | 2 +-
 repository/pom.xml                                          | 3 +--
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/org.eclipse.corrosion.feature/feature.xml b/org.eclipse.corrosion.feature/feature.xml
index 3c754fd..39c66a9 100644
--- a/org.eclipse.corrosion.feature/feature.xml
+++ b/org.eclipse.corrosion.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.corrosion.feature"
       label="%name"
-      version="1.2.5.qualifier"
+      version="1.3.0.qualifier"
       provider-name="Eclipse Corrosion"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.corrosion.product.branding/META-INF/MANIFEST.MF b/org.eclipse.corrosion.product.branding/META-INF/MANIFEST.MF
index d6d41e7..9cc826a 100644
--- a/org.eclipse.corrosion.product.branding/META-INF/MANIFEST.MF
+++ b/org.eclipse.corrosion.product.branding/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.corrosion.product.branding;singleton:=true
-Bundle-Version: 1.2.4.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Corrosion
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app,
diff --git a/org.eclipse.corrosion.product.branding/pom.xml b/org.eclipse.corrosion.product.branding/pom.xml
index b0d4813..32cdda4 100644
--- a/org.eclipse.corrosion.product.branding/pom.xml
+++ b/org.eclipse.corrosion.product.branding/pom.xml
@@ -23,11 +23,11 @@
 	<parent>
 		<groupId>org.eclipse.corrosion</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.4-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.corrosion.product.branding</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.2.4-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 
 </project>
diff --git a/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF b/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF
index b62af5b..136df8e 100644
--- a/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.corrosion.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Fragment-Host: org.eclipse.corrosion
 Eclipse-BundleShape: dir
diff --git a/org.eclipse.corrosion/META-INF/MANIFEST.MF b/org.eclipse.corrosion/META-INF/MANIFEST.MF
index 2f0d10b..cdbf80c 100644
--- a/org.eclipse.corrosion/META-INF/MANIFEST.MF
+++ b/org.eclipse.corrosion/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.corrosion;singleton:=true
-Bundle-Version: 1.2.5.qualifier
+Bundle-Version: 1.3.0.qualifier
 Automatic-Module-Name: org.eclipse.corrosion
 Bundle-Activator: org.eclipse.corrosion.CorrosionPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/pom.xml b/pom.xml
index b41ac3a..57c9aab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.corrosion</groupId>
 	<artifactId>parent</artifactId>
-	<version>1.2.4-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
 		<tycho-version>4.0.8</tycho-version>
diff --git a/repository/pom.xml b/repository/pom.xml
index 3513b10..cd3fc4d 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -21,12 +21,11 @@
 	<parent>
 		<groupId>org.eclipse.corrosion</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.4-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.corrosion.product</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>1.2.5-SNAPSHOT</version>
 
 	<build>
  		<plugins>