From a9ea98613d1d80a845f0f278cf16a53b95e4877b Mon Sep 17 00:00:00 2001
From: Ed Merks <Ed.Merks@gmail.com>
Date: Thu, 8 Jun 2023 16:15:07 +0200
Subject: [PATCH] Eliminate the blocking of signing (#1314)

https://github.com/eclipse-birt/birt/issues/1286
---
 common/org.apache.batik.dom.birt.ext/pom.xml         | 12 ------------
 common/org.apache.batik.transcoder.birt.ext/pom.xml  | 12 ------------
 common/org.w3c.dom.svg.extension/pom.xml             | 12 ------------
 model/org.eclipse.birt.report.model.tests/pom.xml    | 11 ++++-------
 .../org.eclipse.birt.report.tests.model/pom.xml      | 11 ++++-------
 5 files changed, 8 insertions(+), 50 deletions(-)

diff --git a/common/org.apache.batik.dom.birt.ext/pom.xml b/common/org.apache.batik.dom.birt.ext/pom.xml
index c86be17661..f540b9d43b 100644
--- a/common/org.apache.batik.dom.birt.ext/pom.xml
+++ b/common/org.apache.batik.dom.birt.ext/pom.xml
@@ -25,16 +25,4 @@
 	<artifactId>org.apache.batik.dom.birt.ext</artifactId>
 	<version>1.14.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.cbi.maven.plugins</groupId>
-				<artifactId>eclipse-jarsigner-plugin</artifactId>
-				<version>${cbi-version}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/common/org.apache.batik.transcoder.birt.ext/pom.xml b/common/org.apache.batik.transcoder.birt.ext/pom.xml
index d781229f40..36e4833844 100644
--- a/common/org.apache.batik.transcoder.birt.ext/pom.xml
+++ b/common/org.apache.batik.transcoder.birt.ext/pom.xml
@@ -25,16 +25,4 @@
 	<artifactId>org.apache.batik.transcoder.birt.ext</artifactId>
 	<version>1.14.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.cbi.maven.plugins</groupId>
-				<artifactId>eclipse-jarsigner-plugin</artifactId>
-				<version>${cbi-version}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/common/org.w3c.dom.svg.extension/pom.xml b/common/org.w3c.dom.svg.extension/pom.xml
index 4429f2d28a..81c62a75e3 100644
--- a/common/org.w3c.dom.svg.extension/pom.xml
+++ b/common/org.w3c.dom.svg.extension/pom.xml
@@ -24,16 +24,4 @@
 	<artifactId>org.w3c.dom.svg.extension</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.cbi.maven.plugins</groupId>
-				<artifactId>eclipse-jarsigner-plugin</artifactId>
-				<version>${cbi-version}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/model/org.eclipse.birt.report.model.tests/pom.xml b/model/org.eclipse.birt.report.model.tests/pom.xml
index f7ab2bdbc8..dc8080cadf 100644
--- a/model/org.eclipse.birt.report.model.tests/pom.xml
+++ b/model/org.eclipse.birt.report.model.tests/pom.xml
@@ -66,7 +66,7 @@
 			</plugin>
 		</plugins>
 	</build>
-	<!-- unbind jarsigner because this plugin contains nested jars which break it -->
+
 	<profiles>
 		<profile>
 			<id>build-server</id>
@@ -76,12 +76,9 @@
 						<groupId>org.eclipse.cbi.maven.plugins</groupId>
 						<artifactId>eclipse-jarsigner-plugin</artifactId>
 						<version>${cbi-version}</version>
-						<executions>
-							<execution>
-								<id>sign</id>
-								<phase />
-							</execution>
-						</executions>
+						<configuration>
+							<excludeInnerJars>true</excludeInnerJars>
+						</configuration>
 					</plugin>
 				</plugins>
 			</build>
diff --git a/testsuites/org.eclipse.birt.report.tests.model/pom.xml b/testsuites/org.eclipse.birt.report.tests.model/pom.xml
index 77226e61f9..8fa411d59f 100644
--- a/testsuites/org.eclipse.birt.report.tests.model/pom.xml
+++ b/testsuites/org.eclipse.birt.report.tests.model/pom.xml
@@ -53,7 +53,7 @@
 			</plugin>
 		</plugins>
 	</build>
-	<!-- unbind jarsigner because this plugin contains nested jars which break it -->
+
 	<profiles>
 		<profile>
 			<id>build-server</id>
@@ -63,12 +63,9 @@
 						<groupId>org.eclipse.cbi.maven.plugins</groupId>
 						<artifactId>eclipse-jarsigner-plugin</artifactId>
 						<version>${cbi-version}</version>
-						<executions>
-							<execution>
-								<id>sign</id>
-								<phase />
-							</execution>
-						</executions>
+						<configuration>
+							<excludeInnerJars>true</excludeInnerJars>
+						</configuration>
 					</plugin>
 				</plugins>
 			</build>