From d2dc1a3bd3ea623559dbc0ddea02ffbcb7b4855e Mon Sep 17 00:00:00 2001
From: eparovyshnaya <elena.parovyshnaya@gmail.com>
Date: Fri, 2 Aug 2024 20:25:15 +0300
Subject: [PATCH 1/2] [#1404] FLS: evolve to reduce maintenance cost

- remove redundant dependencies
---
 .../category.xml                              |  96 +++++------
 .../category.xml                              | 150 ++++++++----------
 .../org.eclipse.passage.target.target         |   4 -
 3 files changed, 106 insertions(+), 144 deletions(-)

diff --git a/releng/org.eclipse.passage.ldc.repository/category.xml b/releng/org.eclipse.passage.ldc.repository/category.xml
index f1fca4e6b..cca81bc3c 100644
--- a/releng/org.eclipse.passage.ldc.repository/category.xml
+++ b/releng/org.eclipse.passage.ldc.repository/category.xml
@@ -11,58 +11,46 @@
      ArSysOp - initial API and implementation
 -->
 <site>
-	<category-def
-		name="org.eclipse.passage.ldc.category"
-		label="Passage LDC">
-		<description>
-			Passage Licensing Definition Components: 
-				Eclipse PDE integration" 
-		</description>
-	</category-def>
-	<feature 
-		id="org.eclipse.passage.ldc.feature">
-		<category name="org.eclipse.passage.ldc.category" />
-	</feature>
-	<category-def
-		name="org.eclipse.passage.ldc.category.source"
-		label="Passage LDC Developer Resources">
-		<description>
-			Passage Licensing Definition Components Developer Resources: 
-				Eclipse PDE integration" 
-		</description>
-	</category-def>
-	<feature 
-		id="org.eclipse.passage.ldc.feature.source">
-		<category name="org.eclipse.passage.ldc.category.source" />
-	</feature>
-	<bundle id="bcpg" />
-	<bundle id="bcpg.source" />
-	<bundle id="bcpkix" />
-	<bundle id="bcpkix.source" />
-	<bundle id="bcprov" />
-	<bundle id="bcprov.source" />
-	<bundle id="bcutil" />
-	<bundle id="bcutil.source" />
-	<bundle id="com.fasterxml.jackson.core.jackson-annotations"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-core"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-databind"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-databind.source"/>
-	<bundle id="com.github.oshi.oshi-core" />
-	<bundle id="com.github.oshi.oshi-core.source" />
-	<bundle id="com.sun.jna" />
-	<bundle id="com.sun.jna.source" />
-	<bundle id="com.sun.jna.platform" />
-	<bundle id="com.sun.jna.platform.source" />
-	<bundle id="jakarta.activation-api" />
-	<bundle id="jakarta.activation-api.source" />
-	<bundle id="jakarta.annotation-api" />
-	<bundle id="jakarta.annotation-api.source" />
-	<bundle id="jakarta.servlet-api" />
-	<bundle id="jakarta.servlet-api.source" />
-	<bundle id="slf4j.api" />
-	<bundle id="slf4j.api.source" />
-	<bundle id="slf4j.nop" />
-	<bundle id="slf4j.nop.source" />
+   <feature id="org.eclipse.passage.ldc.feature">
+      <category name="org.eclipse.passage.ldc.category"/>
+   </feature>
+   <feature id="org.eclipse.passage.ldc.feature.source">
+      <category name="org.eclipse.passage.ldc.category.source"/>
+   </feature>
+   <bundle id="bcpg"/>
+   <bundle id="bcpg.source"/>
+   <bundle id="bcpkix"/>
+   <bundle id="bcpkix.source"/>
+   <bundle id="bcprov"/>
+   <bundle id="bcprov.source"/>
+   <bundle id="bcutil"/>
+   <bundle id="bcutil.source"/>
+   <bundle id="com.github.oshi.oshi-core"/>
+   <bundle id="com.github.oshi.oshi-core.source"/>
+   <bundle id="com.sun.jna"/>
+   <bundle id="com.sun.jna.source"/>
+   <bundle id="com.sun.jna.platform"/>
+   <bundle id="com.sun.jna.platform.source"/>
+   <bundle id="jakarta.activation-api"/>
+   <bundle id="jakarta.activation-api.source"/>
+   <bundle id="jakarta.annotation-api"/>
+   <bundle id="jakarta.annotation-api.source"/>
+   <bundle id="jakarta.servlet-api"/>
+   <bundle id="jakarta.servlet-api.source"/>
+   <bundle id="slf4j.api"/>
+   <bundle id="slf4j.api.source"/>
+   <bundle id="slf4j.nop"/>
+   <bundle id="slf4j.nop.source"/>
+   <category-def name="org.eclipse.passage.ldc.category" label="Passage LDC">
+      <description>
+         Passage Licensing Definition Components: 
+    Eclipse PDE integration&quot;
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.passage.ldc.category.source" label="Passage LDC Developer Resources">
+      <description>
+         Passage Licensing Definition Components Developer Resources: 
+    Eclipse PDE integration&quot;
+      </description>
+   </category-def>
 </site>
diff --git a/releng/org.eclipse.passage.lic.repository/category.xml b/releng/org.eclipse.passage.lic.repository/category.xml
index 37b9e3287..c4a5cfc56 100644
--- a/releng/org.eclipse.passage.lic.repository/category.xml
+++ b/releng/org.eclipse.passage.lic.repository/category.xml
@@ -12,90 +12,68 @@
 		ArSysOp - initial API and implementation
 -->
 <site>
-	<category-def
-		name="org.eclipse.passage.lic.category"
-		label="Passage LIC">
-		<description>
-			Passage Licensing Integration Components includes: Licensing Runtime API and its implementation for Eclipse Equinox, Licensing JFace components, Licensing Metadata EMF API, License Management Integrations
-		</description>
-	</category-def>
-	<feature
-		id="org.eclipse.passage.lic.compile.feature">
-		<category name="org.eclipse.passage.lic.category" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.lic.execute.feature">
-		<category name="org.eclipse.passage.lic.category" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.lic.define.feature">
-		<category name="org.eclipse.passage.lic.category" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.lic.bc.feature">
-		<category name="org.eclipse.passage.lic.category" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.lic.api.tests.feature">
-		<category name="org.eclipse.passage.lic.category" />
-	</feature>
-
-	<category-def
-		name="org.eclipse.passage.lic.category.source"
-		label="Passage LIC Developer Resources">
-		<description>
-			Passage Licensing Integration Components Developer Resources includes: Licensing Runtime API and its implementation for Eclipse Equinox, Licensing JFace components, Licensing Metadata EMF API, License Management Integrations
-		</description>
-	</category-def>
-	<feature
-		id="org.eclipse.passage.lic.compile.feature.source">
-		<category name="org.eclipse.passage.lic.category.source" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.lic.api.tests.feature.source">
-		<category name="org.eclipse.passage.lic.category.source" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.lic.execute.feature.source">
-		<category name="org.eclipse.passage.lic.category.source" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.lic.define.feature.source">
-		<category name="org.eclipse.passage.lic.category.source" />
-	</feature>
-	<feature
-		id="org.eclipse.passage.lic.bc.feature.source">
-		<category name="org.eclipse.passage.lic.category.source" />
-	</feature>
-
-	<bundle id="bcpg" />
-	<bundle id="bcpg.source" />
-	<bundle id="bcpkix" />
-	<bundle id="bcpkix.source" />
-	<bundle id="bcprov" />
-	<bundle id="bcprov.source" />
-	<bundle id="bcutil" />
-	<bundle id="bcutil.source" />
-	<bundle id="com.fasterxml.jackson.core.jackson-annotations"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-core"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-databind"/>
-	<bundle id="com.fasterxml.jackson.core.jackson-databind.source"/>
-	<bundle id="com.github.oshi.oshi-core" />
-	<bundle id="com.github.oshi.oshi-core.source" />
-	<bundle id="com.sun.jna" />
-	<bundle id="com.sun.jna.source" />
-	<bundle id="com.sun.jna.platform" />
-	<bundle id="com.sun.jna.platform.source" />
-	<bundle id="jakarta.activation-api" />
-	<bundle id="jakarta.activation-api.source" />
-	<bundle id="jakarta.annotation-api" />
-	<bundle id="jakarta.annotation-api.source" />
-	<bundle id="jakarta.servlet-api" />
-	<bundle id="jakarta.servlet-api.source" />
-	<bundle id="slf4j.api" />
-	<bundle id="slf4j.api.source" />
-	<bundle id="slf4j.nop" />
-	<bundle id="slf4j.nop.source" />
+   <feature id="org.eclipse.passage.lic.compile.feature">
+      <category name="org.eclipse.passage.lic.category"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.execute.feature">
+      <category name="org.eclipse.passage.lic.category"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.define.feature">
+      <category name="org.eclipse.passage.lic.category"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.bc.feature">
+      <category name="org.eclipse.passage.lic.category"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.api.tests.feature">
+      <category name="org.eclipse.passage.lic.category"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.compile.feature.source">
+      <category name="org.eclipse.passage.lic.category.source"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.api.tests.feature.source">
+      <category name="org.eclipse.passage.lic.category.source"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.execute.feature.source">
+      <category name="org.eclipse.passage.lic.category.source"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.define.feature.source">
+      <category name="org.eclipse.passage.lic.category.source"/>
+   </feature>
+   <feature id="org.eclipse.passage.lic.bc.feature.source">
+      <category name="org.eclipse.passage.lic.category.source"/>
+   </feature>
+   <bundle id="bcpg"/>
+   <bundle id="bcpg.source"/>
+   <bundle id="bcpkix"/>
+   <bundle id="bcpkix.source"/>
+   <bundle id="bcprov"/>
+   <bundle id="bcprov.source"/>
+   <bundle id="bcutil"/>
+   <bundle id="bcutil.source"/>
+   <bundle id="com.github.oshi.oshi-core"/>
+   <bundle id="com.github.oshi.oshi-core.source"/>
+   <bundle id="com.sun.jna"/>
+   <bundle id="com.sun.jna.source"/>
+   <bundle id="com.sun.jna.platform"/>
+   <bundle id="com.sun.jna.platform.source"/>
+   <bundle id="jakarta.activation-api"/>
+   <bundle id="jakarta.activation-api.source"/>
+   <bundle id="jakarta.annotation-api"/>
+   <bundle id="jakarta.annotation-api.source"/>
+   <bundle id="jakarta.servlet-api"/>
+   <bundle id="jakarta.servlet-api.source"/>
+   <bundle id="slf4j.api"/>
+   <bundle id="slf4j.api.source"/>
+   <bundle id="slf4j.nop"/>
+   <bundle id="slf4j.nop.source"/>
+   <category-def name="org.eclipse.passage.lic.category" label="Passage LIC">
+      <description>
+         Passage Licensing Integration Components includes: Licensing Runtime API and its implementation for Eclipse Equinox, Licensing JFace components, Licensing Metadata EMF API, License Management Integrations
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.passage.lic.category.source" label="Passage LIC Developer Resources">
+      <description>
+         Passage Licensing Integration Components Developer Resources includes: Licensing Runtime API and its implementation for Eclipse Equinox, Licensing JFace components, Licensing Metadata EMF API, License Management Integrations
+      </description>
+   </category-def>
 </site>
diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
index f293cd17d..0686cdd7a 100644
--- a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
+++ b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
@@ -39,13 +39,9 @@
 			<unit id="bcpkix" version="0.0.0"/>
 			<unit id="bcprov" version="0.0.0"/>
 			<unit id="bcutil" version="0.0.0"/>
-			<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
-			<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
-			<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
 			<unit id="com.github.oshi.oshi-core" version="0.0.0"/>
 			<unit id="com.sun.jna" version="0.0.0"/>
 			<unit id="com.sun.jna.platform" version="0.0.0"/>
-			<unit id="jakarta.activation-api" version="0.0.0"/>
 			<unit id="jakarta.annotation-api" version="1.3.5"/>
 			<unit id="jakarta.servlet-api" version="0.0.0"/>
 			<unit id="org.apache.commons.commons-csv" version="0.0.0"/>

From 9c758e7a407572e41da9d111501ed8f13dc9df05 Mon Sep 17 00:00:00 2001
From: eparovyshnaya <elena.parovyshnaya@gmail.com>
Date: Fri, 2 Aug 2024 21:18:29 +0300
Subject: [PATCH 2/2] [#1404] FLS: evolve to reduce maintenance cost

- remove redundant dependencies
---
 .../org.eclipse.passage.target/org.eclipse.passage.target.target | 1 +
 1 file changed, 1 insertion(+)

diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
index 0686cdd7a..ff76646c4 100644
--- a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
+++ b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
@@ -42,6 +42,7 @@
 			<unit id="com.github.oshi.oshi-core" version="0.0.0"/>
 			<unit id="com.sun.jna" version="0.0.0"/>
 			<unit id="com.sun.jna.platform" version="0.0.0"/>
+			<unit id="jakarta.activation-api" version="0.0.0"/>
 			<unit id="jakarta.annotation-api" version="1.3.5"/>
 			<unit id="jakarta.servlet-api" version="0.0.0"/>
 			<unit id="org.apache.commons.commons-csv" version="0.0.0"/>